Changes for Java 7 compatibility, and updated default signature files.