[[ Bug 12885 ]] Tweaks to get things compiling on windows