fixes for protocol compliance