IBT: more fixes for refactoring