JBIDE-14917 - fixes as per fred's suggestions