Java 7 code corrections, updated library references.