More provisioning fixes.