Some libc5 cleanups