A bunch of chagnes to make bare metal deploys work

this is not required any more