Fix some protocol behavior