Fixes to the configuration script from a vanilla install