non-provisioning mode fixes