Minor fixes for previous commit regarding: https://issues.jboss.org/browse/DTGOV-205