Make changes based on feedback in https://github.com/wildfly/wildfly-core/pull/84