Ordering fix and forcing umounts