Provision fixes

This fixes a couple minor problems with provisioning that were leading to problems with deletion and processing timeouts.