Fixes for an old gcc version