JDK6 adjustments: changed primitive types to object types (e.g. long to Long)
JDK6 adjustment: changed javac source and target from 1.7 to 1.6