Minor fixes needed for VS2013 x64 build