Various protocol issue fixes part 1.