Tweaks to build on AIX