Fixed issues with Paths on Windows