Fixed some PWD issues