Some Java8-ification / thread safety work