HSoM changes; might have screwed up some MUI stuff that Dan has done.