Fixes for old gcc compilers