more fixes for GRECLIPSE-1565