fixes for eclipse