some fixes from cpp11-msvc