Tweaks to get develop branch compiling on Windows.