Small fixes needed to get it working on latest WildFly master