Some more adjustments for odoo v8 oddities...