adjustements for jboss and bug fixes