Re-org to eliminate an MVMROOT and correct another