Fixed migrations to use settings for default/choices