[Coding conventions] A few fixes - To be squashed with 2nd commit

Signed-off-by: Regis Merlino <regis.merlino@intel.com>