Flushing fixes