Fixes due to  the jboss community

https://community.jboss.org/message/875005#jive-37943998089325092174