Fix potential MSVC problems