Fix bugs in context flushing