minor changes for jboss 6 upgrade