some more protocol fixes