More libc5 fixups
 -Erik
8 files changed