Tidy up some env variables