More kdo eclipse fixes

RIO-112