clean up on VS2012 warnings