App selection fixes