More MSVC warning fixes: