diff --git a/addons/gamification/data/badge.xml b/addons/gamification/data/badge.xml
index 5a390be9deb..4035c51cfc8 100644
--- a/addons/gamification/data/badge.xml
+++ b/addons/gamification/data/badge.xml
@@ -32,10 +32,6 @@
             <field name="rule_max_number">2</field>
             <field name="image" type="base64" file="gamification/static/img/badge_idea-image.png"/>
         </record>
-    </data>
-
-
-    <data noupdate="0">
 
         <record id="email_template_badge_received" model="email.template">
             <field name="name">Received Badge</field>
diff --git a/addons/gamification/data/cron.xml b/addons/gamification/data/cron.xml
index 8585771c97d..105f7d25681 100644
--- a/addons/gamification/data/cron.xml
+++ b/addons/gamification/data/cron.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <openerp>
-    <data>
+    <data noupdate="1">
         <record forcecreate="True" id="ir_cron_check_challenge"
             model="ir.cron">
             <field name="name">Run Goal Challenge Checker</field>
diff --git a/addons/gamification/data/goal_base.xml b/addons/gamification/data/goal_base.xml
index c8c18564772..1c18a5a70e5 100644
--- a/addons/gamification/data/goal_base.xml
+++ b/addons/gamification/data/goal_base.xml
@@ -92,10 +92,6 @@
             ]]></field>
         </record>
 
-    </data>
-
-    <data>
-
         <!-- goal definitions -->
         <record model="gamification.goal.definition" id="definition_base_timezone">
             <field name="name">Set your Timezone</field>
diff --git a/addons/gamification/models/challenge.py b/addons/gamification/models/challenge.py
index 06d0c44baac..8ac7753898f 100644
--- a/addons/gamification/models/challenge.py
+++ b/addons/gamification/models/challenge.py
@@ -377,6 +377,7 @@ class gamification_challenge(osv.Model):
         can be called after each change in the list of users or lines.
         :param list(int) ids: the list of challenge concerned"""
 
+        goal_obj = self.pool.get('gamification.goal')
         for challenge in self.browse(cr, uid, ids, context):
             (start_date, end_date) = start_end_date_for_period(challenge.period)
 
@@ -390,7 +391,6 @@ class gamification_challenge(osv.Model):
                 # FIXME: allow to restrict to a subset of users
                 for user in challenge.user_ids:
 
-                    goal_obj = self.pool.get('gamification.goal')
                     domain = [('line_id', '=', line.id), ('user_id', '=', user.id)]
                     if start_date:
                         domain.append(('start_date', '=', start_date))
diff --git a/addons/gamification_sale_crm/sale_crm_goals.xml b/addons/gamification_sale_crm/sale_crm_goals.xml
index 4c1f8e46149..6db77be1aaf 100644
--- a/addons/gamification_sale_crm/sale_crm_goals.xml
+++ b/addons/gamification_sale_crm/sale_crm_goals.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <openerp>
-    <data>
+    <data noupdate="1">
 
         <!-- goal definitions -->
         <record model="gamification.goal.definition" id="definition_crm_tot_invoices">