Fixes for Windows build warnings on VS2012 (after gcc pong)