Various fixes on device create