Fixes #838 - Resolve various issues relating to file path differences between Windows and Unix