Trivial changes to compile in msvc