[[ RefactorGraphics ]] Tweaks to get the Windows server engines to build.