Implemented OSX PATH change to Windows code too + minor tweaks