Resolved build issues, should now actually work with java 1.7