MSVC warnings removed