Small protocol fixes.