diff --git a/src/org/lineageos/setupwizard/CaptivePortalSetupActivity.java b/src/org/lineageos/setupwizard/CaptivePortalSetupActivity.java
index 6fde1431..598e92a5 100644
--- a/src/org/lineageos/setupwizard/CaptivePortalSetupActivity.java
+++ b/src/org/lineageos/setupwizard/CaptivePortalSetupActivity.java
@@ -131,6 +131,8 @@ public class CaptivePortalSetupActivity extends SubBaseActivity {
                             public void appResponse(int response) {}
                             @Override
                             public void logEvent(int eventId, String packageName) {}
+                            @Override
+                            public void appRequest(int request) {}
                         }));
                 intent.putExtra("status_bar_color",
                         context.getResources().getColor(R.color.primary_dark));
diff --git a/src/org/lineageos/setupwizard/LocaleActivity.java b/src/org/lineageos/setupwizard/LocaleActivity.java
index 3e9b71cf..9f9b025e 100644
--- a/src/org/lineageos/setupwizard/LocaleActivity.java
+++ b/src/org/lineageos/setupwizard/LocaleActivity.java
@@ -34,8 +34,8 @@ import android.widget.ArrayAdapter;
 import android.widget.NumberPicker;
 import android.widget.Toast;
 
-import com.android.internal.telephony.MccTable;
 import com.android.internal.telephony.TelephonyIntents;
+import com.android.internal.telephony.util.LocaleUtils;
 
 import org.lineageos.setupwizard.R;
 import org.lineageos.setupwizard.widget.LocalePicker;
@@ -217,7 +217,7 @@ public class LocaleActivity extends BaseSetupWizardActivity {
 
                 // Fetch locale for active sim's MCC
                 int mcc = activeSubs.get(0).getMcc();
-                locale = MccTable.getLocaleFromMcc(activity, mcc, null);
+                locale = LocaleUtils.getLocaleFromMcc(activity, mcc, null);
 
                 // If that fails, fall back to preferred languages reported
                 // by the sim
diff --git a/src/org/lineageos/setupwizard/util/PhoneMonitor.java b/src/org/lineageos/setupwizard/util/PhoneMonitor.java
index 07b42991..32dfe887 100644
--- a/src/org/lineageos/setupwizard/util/PhoneMonitor.java
+++ b/src/org/lineageos/setupwizard/util/PhoneMonitor.java
@@ -53,7 +53,7 @@ import android.content.IntentFilter;
 import android.os.Handler;
 import android.os.HandlerExecutor;
 import android.os.Looper;
-import android.os.SystemProperties;
+import android.sysprop.TelephonyProperties;
 import android.telephony.PhoneStateListener;
 import android.telephony.ServiceState;
 import android.telephony.SignalStrength;
@@ -310,11 +310,11 @@ public class PhoneMonitor {
     }
 
     public int getLteOnCdmaMode(int subId) {
-        if (mTelephony == null || mTelephony.createForSubscriptionId(subId).getLteOnCdmaMode()
+        if (mTelephony == null || mTelephony.createForSubscriptionId(subId).getLteOnCdmaMode(subId)
                     == LTE_ON_CDMA_UNKNOWN) {
-            return SystemProperties.getInt("telephony.lteOnCdmaDevice", LTE_ON_CDMA_UNKNOWN);
+            return TelephonyProperties.lte_on_cdma_device().orElse(LTE_ON_CDMA_UNKNOWN);
         }
-        return mTelephony.createForSubscriptionId(subId).getLteOnCdmaMode();
+        return mTelephony.createForSubscriptionId(subId).getLteOnCdmaMode(subId);
     }
 
     private void logPhoneState(String prefix) {