Updated rewrite flushing procedures