More robust messaging, make sure bolts don't get far behind spouts