minor fixes before applying Mike's changes
Changes related to provisioning