Code changes needed to resolve openjdk17 issues