Fixes after refactorings in OT api.