And more GCC >= 4.8 fixes