Fixes for wildfly