Fix ups needed to build under GCC 4.9