Irb Protocol bug fixes