Final fixes

Baremetal bot complete