Fix migrating bare metals