fixes for VC++ 2013