Minor tweaks to get the develop branch compiling on Windows.