Further tweaks to get the file permissions/ownership at time of initial setup correct inside a VM