WIP: Improved portability to AIX, HP-UX