Minor Change: Support compilation on Java 8