Couple of MSVC warning clean-ups.