Wildfly improvments