protocol fixes