Fix some issues during provisioning