JBSEAM-5062 - some minor improvements