More JDK1.5 work