fixing protocol diff issues