Fix for MSVC warnings