changes needed oto get compiling again after the rebase to master OT/OT