Code cleanups, changes for Java 7