More java 8 tweaks