Migrate over another two legacy features