More tweaks to startup and provision scripts