Updated some env stuff