Protocol bug fixes