JBIDE-17148 - fixes as per fred's suggestions