[wildfly-dev] Fixes for WildFly 18.0.1.Final