Made changes necessary to compile zu with java 1.6 compiler