Fixing protocol rigs for testing with v5.