Tweaks to get things compiling on Windows.