Fixed some environment path issues