Minor tweaks to support MSVC.