Fixes for IRB Protocol almost complete