Add missing changes for protocol > 1000