Fix issues based on provisioning test