Some polish and lag reduction for state-sync