Some more fixes in the sunriseset protocol