Allow building with JDK 7 and fix arrows