Fixes after Pau & Fabrice's feedback

Change-Id: I0ecc1e1942894b648c8f3c44c59855b78ff1488d