diff --git a/runbot/models/build.py b/runbot/models/build.py
index f05d1095..8d7da4e4 100644
--- a/runbot/models/build.py
+++ b/runbot/models/build.py
@@ -57,9 +57,9 @@ class runbot_build(models.Model):
     # state machine
 
     global_state = fields.Selection(make_selection(state_order), string='Status', compute='_compute_global_state', store=True)
-    local_state = fields.Selection(make_selection(state_order), string='Build Status', default='pending', required=True, oldname='state', index=True)
+    local_state = fields.Selection(make_selection(state_order), string='Build Status', default='pending', required=True, index=True)
     global_result = fields.Selection(make_selection(result_order), string='Result', compute='_compute_global_result', store=True)
-    local_result = fields.Selection(make_selection(result_order), string='Build Result', oldname='result')
+    local_result = fields.Selection(make_selection(result_order), string='Build Result')
     triggered_result = fields.Selection(make_selection(result_order), string='Triggered Result')  # triggered by db only
 
     requested_action = fields.Selection([('wake_up', 'To wake up'), ('deathrow', 'To kill')], string='Action requested', index=True)
diff --git a/runbot/models/event.py b/runbot/models/event.py
index cfd3db9d..e4f7fff9 100644
--- a/runbot/models/event.py
+++ b/runbot/models/event.py
@@ -16,7 +16,7 @@ class runbot_event(models.Model):
 
     build_id = fields.Many2one('runbot.build', 'Build', index=True, ondelete='cascade')
     active_step_id = fields.Many2one('runbot.build.config.step', 'Active step', index=True)
-    type = fields.Selection(TYPES, string='Type', required=True, index=True)
+    type = fields.Selection(selection_add=TYPES, string='Type', required=True, index=True)
 
     def init(self):
         parent_class = super(runbot_event, self)