more fixes for greclipse