Provisioning fixes