minor MSVC compatibility fixes