ISPN-2763

Some more trivial polishing

 - https://issues.jboss.org/browse/ISPN-2763