More fixes for C++98