Fixes for MSVC.