Fixes discovered through provisioning