Port to java 17