Update to run on java 1.7