MSVC warning fixes