Baremetal : Some fixes

Change-Id: Ie721aa36dfea72804f71c14fe5eda52c173817d3