First step towards java 8 (build broken for now