Better back-compat in app setup.