Bit more protocol tightening.