port some more Java8 stuff back to Java6