Protocol tweaks