Some fixups to ensure we work with busybox/klibc-utils