protocol fixes, #20836