Fix integration choices

Emily Lancietti requested to merge fix_integration_choices into master Aug 19, 2020