Fix some provisioning steps