fixes for eclipse.