diff --git a/Meshtastic/Persistence/UpdateCoreData.swift b/Meshtastic/Persistence/UpdateCoreData.swift
index bc0093a8..4decfc62 100644
--- a/Meshtastic/Persistence/UpdateCoreData.swift
+++ b/Meshtastic/Persistence/UpdateCoreData.swift
@@ -807,32 +807,32 @@ func upsertPositionConfigPacket(config: Config.PositionConfig, nodeNum: Int64, s
 				let newPositionConfig = PositionConfigEntity(context: context)
 				newPositionConfig.smartPositionEnabled = config.positionBroadcastSmartEnabled
 				newPositionConfig.deviceGpsEnabled = config.gpsEnabled
-				newPositionConfig.gpsMode = Int32(config.gpsMode.rawValue)
-				newPositionConfig.rxGpio = Int32(config.rxGpio)
-				newPositionConfig.txGpio = Int32(config.txGpio)
-				newPositionConfig.gpsEnGpio = Int32(config.gpsEnGpio)
+				newPositionConfig.gpsMode = Int32(truncatingIfNeeded: config.gpsMode.rawValue)
+				newPositionConfig.rxGpio = Int32(truncatingIfNeeded: config.rxGpio)
+				newPositionConfig.txGpio = Int32(truncatingIfNeeded: config.txGpio)
+				newPositionConfig.gpsEnGpio = Int32(truncatingIfNeeded: config.gpsEnGpio)
 				newPositionConfig.fixedPosition = config.fixedPosition
 				newPositionConfig.positionBroadcastSeconds = Int32(truncatingIfNeeded: config.positionBroadcastSecs)
-				newPositionConfig.broadcastSmartMinimumIntervalSecs = Int32(config.broadcastSmartMinimumIntervalSecs)
-				newPositionConfig.broadcastSmartMinimumDistance = Int32(config.broadcastSmartMinimumDistance)
-				newPositionConfig.positionFlags = Int32(config.positionFlags)
+				newPositionConfig.broadcastSmartMinimumIntervalSecs = Int32(truncatingIfNeeded: config.broadcastSmartMinimumIntervalSecs)
+				newPositionConfig.broadcastSmartMinimumDistance = Int32(truncatingIfNeeded: config.broadcastSmartMinimumDistance)
+				newPositionConfig.positionFlags = Int32(truncatingIfNeeded: config.positionFlags)
 				newPositionConfig.gpsAttemptTime = 900
-				newPositionConfig.gpsUpdateInterval = Int32(config.gpsUpdateInterval)
+				newPositionConfig.gpsUpdateInterval = Int32(truncatingIfNeeded: config.gpsUpdateInterval)
 				fetchedNode[0].positionConfig = newPositionConfig
 			} else {
 				fetchedNode[0].positionConfig?.smartPositionEnabled = config.positionBroadcastSmartEnabled
 				fetchedNode[0].positionConfig?.deviceGpsEnabled = config.gpsEnabled
-				fetchedNode[0].positionConfig?.gpsMode = Int32(config.gpsMode.rawValue)
-				fetchedNode[0].positionConfig?.rxGpio = Int32(config.rxGpio)
-				fetchedNode[0].positionConfig?.txGpio = Int32(config.txGpio)
-				fetchedNode[0].positionConfig?.gpsEnGpio = Int32(config.gpsEnGpio)
+				fetchedNode[0].positionConfig?.gpsMode = Int32(truncatingIfNeeded: config.gpsMode.rawValue)
+				fetchedNode[0].positionConfig?.rxGpio = Int32(truncatingIfNeeded: config.rxGpio)
+				fetchedNode[0].positionConfig?.txGpio = Int32(truncatingIfNeeded: config.txGpio)
+				fetchedNode[0].positionConfig?.gpsEnGpio = Int32(truncatingIfNeeded: config.gpsEnGpio)
 				fetchedNode[0].positionConfig?.fixedPosition = config.fixedPosition
 				fetchedNode[0].positionConfig?.positionBroadcastSeconds = Int32(truncatingIfNeeded: config.positionBroadcastSecs)
-				fetchedNode[0].positionConfig?.broadcastSmartMinimumIntervalSecs = Int32(config.broadcastSmartMinimumIntervalSecs)
-				fetchedNode[0].positionConfig?.broadcastSmartMinimumDistance = Int32(config.broadcastSmartMinimumDistance)
+				fetchedNode[0].positionConfig?.broadcastSmartMinimumIntervalSecs = Int32(truncatingIfNeeded: config.broadcastSmartMinimumIntervalSecs)
+				fetchedNode[0].positionConfig?.broadcastSmartMinimumDistance = Int32(truncatingIfNeeded: config.broadcastSmartMinimumDistance)
 				fetchedNode[0].positionConfig?.gpsAttemptTime = 900
-				fetchedNode[0].positionConfig?.gpsUpdateInterval = Int32(config.gpsUpdateInterval)
-				fetchedNode[0].positionConfig?.positionFlags = Int32(config.positionFlags)
+				fetchedNode[0].positionConfig?.gpsUpdateInterval = Int32(truncatingIfNeeded: config.gpsUpdateInterval)
+				fetchedNode[0].positionConfig?.positionFlags = Int32(truncatingIfNeeded: config.positionFlags)
 			}
 			if sessionPasskey != nil {
 				fetchedNode[0].sessionPasskey = sessionPasskey
diff --git a/protobufs b/protobufs
index 0302caa2..816595c8 160000
--- a/protobufs
+++ b/protobufs
@@ -1 +1 @@
-Subproject commit 0302caa2bcdc15aee6f368fc57e78e0b85f7324e
+Subproject commit 816595c8bbdfc3b4388e11348ccd043294d58705