Provisioning: Fixing bugs