[Fixup] To be squashed - Various fixes following PR comments

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