Additional tweaks for: https://issues.jboss.org/browse/DTGOV-6

https://issues.jboss.org/browse/DTGOV-6