Resolved various errors on Windows