JBIDE-18401: minor improvements