Fix an assortment of imports from STAC SVN tree mv