Config: Reconcile with Android compatibility