More fixes on C++98 mode