Updating compilation for gcc 4.7