[Fixup] To be sqashed - A set of fixes following comments

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