Some more protocol handler fixes.