Move remaining choices to be determined dynamically in the migrations

Fix remaining choices 
See #3479