diff --git a/gps.xml.l10 b/gps.xml.l10
index a98ea61..d6f7442 100644
--- a/gps.xml.l10
+++ b/gps.xml.l10
@@ -75,6 +75,7 @@
 
        EnableOnChipStopNotification="2"
        PowerMode="3"
+       MinGpsWeekNumber="2216"
   />
 
   <gll_features
diff --git a/gps_user.xml.l10 b/gps_user.xml.l10
index a982f5e..a85788d 100644
--- a/gps_user.xml.l10
+++ b/gps_user.xml.l10
@@ -74,6 +74,7 @@
 
        EnableOnChipStopNotification="false"
        PowerMode="3"
+       MinGpsWeekNumber="2216"
   />
 
   <gll_features
diff --git a/lynx/overlay/packages/apps/Nfc/res/values/config.xml b/lynx/overlay/packages/apps/Nfc/res/values/config.xml
new file mode 100644
index 0000000..34bf74e
--- /dev/null
+++ b/lynx/overlay/packages/apps/Nfc/res/values/config.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2022 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+  <bool name="nfcc_always_on_allowed">false</bool>
+  <string-array name="config_skuSupportsSecureNfc" translatable="false">
+    <item>G0DZQ</item>
+    <item>GWKK3</item>
+    <item>GHL1X</item>
+    <item>G82U8</item>
+  </string-array>
+</resources>
diff --git a/powerhint.json b/powerhint.json
index 0a61b7c..546d0e4 100644
--- a/powerhint.json
+++ b/powerhint.json
@@ -156,7 +156,6 @@
       "Path": "/proc/vendor_sched/ta_uclamp_min",
       "Values": [
         "612",
-        "185",
         "1",
         "63"
       ],
@@ -1285,58 +1284,6 @@
       "Duration": 0,
       "Value": "1"
     },
-    {
-      "PowerHint": "ADPF_DISABLE_TA_BOOST",
-      "Type": "MaskHint",
-      "Value": "BOOST_DISPLAY"
-    },
-    {
-      "PowerHint": "ADPF_DISABLE_TA_BOOST",
-      "Type": "EndHint",
-      "Value": "BOOST_90HZ"
-    },
-    {
-      "PowerHint": "ADPF_DISABLE_TA_BOOST",
-      "Type": "EndHint",
-      "Value": "BOOST_60HZ"
-    },
-    {
-      "PowerHint": "BOOST_DISPLAY",
-      "Type": "DoHint",
-      "Value": "BOOST_90HZ"
-    },
-    {
-      "PowerHint": "BOOST_DISPLAY",
-      "Type": "DoHint",
-      "Value": "BOOST_60HZ"
-    },
-    {
-      "PowerHint": "INTERACTION",
-      "Type": "DoHint",
-      "Value": "BOOST_DISPLAY"
-    },
-    {
-      "PowerHint": "BOOST_90HZ",
-      "Node": "TAUClampBoost",
-      "Duration": 200,
-      "Value": "185"
-    },
-    {
-      "PowerHint": "BOOST_60HZ",
-      "Node": "TAUClampBoost",
-      "Duration": 200,
-      "Value": "185"
-    },
-    {
-      "PowerHint": "REFRESH_90FPS",
-      "Type": "MaskHint",
-      "Value": "BOOST_60HZ"
-    },
-    {
-      "PowerHint": "REFRESH_60FPS",
-      "Type": "MaskHint",
-      "Value": "BOOST_90HZ"
-    },
     {
       "PowerHint": "DISPLAY_IDLE",
       "Node": "FGPreferIdle",
@@ -1354,16 +1301,6 @@
       "Type": "EndHint",
       "Value": "INTERACTION"
     },
-    {
-      "PowerHint": "DISPLAY_IDLE",
-      "Type": "EndHint",
-      "Value": "BOOST_90HZ"
-    },
-    {
-      "PowerHint": "DISPLAY_IDLE",
-      "Type": "EndHint",
-      "Value": "BOOST_60HZ"
-    },
     {
       "PowerHint": "DISPLAY_IDLE",
       "Type": "EndHint",