More provisioning fixes