- Fixed potential flushing issues.