More java8 compat.