More MSVC warning fixes.