Various cleanups for stateinformed

Multiple fixes that I'm making as I debug the initialization protocol