Fixes to allow provisioning