Tweak to GCC 4.8/4.9