Migrate the last few settings to flags