Updates to allow GCC 4.8 or 4.9 us