Tweaks for VC++ compilation.