Move from deferred Flush to explicit Flush