more fixes for msvc2013