Update for new glibc and gcc