Various cleanups
OK, try flushing again.