Even more fixes in the sunriseset procotol