Fixing build for java 6