Fix a few provisioning problems.