Enhancements

These are tracked online via JIRA. See http://jira.jboss.com/jira/browse/JBTM.