fixes for vs2012