First set of changes to make it all useable on other machines.