Actually move before compute_mounts