Update for gcc-4.8