- more C++98 fixes