Fixed some environment