Some cleanups for libc5 support
2 files changed