clean up some warnings that msvc2013 found