minor tweaks to further automate provisioning