More fixes for protocol display