Fix some persist/flush missing