some fixes for msvc2013