Fix broken environment variables resulting from #1 and #2

[yasithdev]

#1 and #2 will likely need some environmental variable tweaks, which should be addressed to bring it to a working state

[yasithdev]

Potential issue 1