Minor enhacement to allow Java 1.6 as Runtime Environment