JBIDE-16606 - small changes as per mmalina's comments