Minor fixes to avoid Visual Studio 2012 warnings