150914 - Fix GLIBC fix issues