Fixing java 8 build