Fix bugs for quit and restore

Can reuse diskfile now