Small tweaks/changes for dtgov-120

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