Tidied up a couple of MSVC warnings.