Improve provisioning on a more vanilla install