Updates to run on WildFly