A bunch of chagnes to make bare metal deploys work