Include protocol implementation fixes