Merge AIX fixes from 3.6