1.6 mac compatibility changes and 1.6 build.xml