protocol: Fixes