updates to a couple files for Java7 compatibility, fixes #1