Making the build compatible with Java 7