fixes for vs2013