Fixed some environmental variables