- more c++98 fixes