Fixes for Windows build warnings on VS2012