Minor changes based on AIX 6.1 testing