AIX branch and other stuff ... work in progess