Tweaks based on testing Indigo in the wild