Some bug fixes to hopefully make the project build more easily in Windows environments.