fix env stuff