Cimpiler fixes for MSVC.