Migrate several slots from MFR to lib