-fixes for vs2013 compatibility