Fixing up build - jdk8 compliant