Changed things to be more sensible for the servers rather than my dev machines.