[[ Bug 11884 ]] Tweaks to get fix compiling on Windows.