Small fixes to stop MSVC from loosing its head.