Update to compile with Java 17