GRECLIPSE-1727 Minor fixes