diff --git a/Main/src/main/java/com/chameleonvision/network/NetworkManager.java b/Main/src/main/java/com/chameleonvision/network/NetworkManager.java
index d1af5e133..f9cd51eb4 100644
--- a/Main/src/main/java/com/chameleonvision/network/NetworkManager.java
+++ b/Main/src/main/java/com/chameleonvision/network/NetworkManager.java
@@ -1,8 +1,8 @@
 package com.chameleonvision.network;
 
 
+import com.chameleonvision.config.ConfigManager;
 import com.chameleonvision.util.Platform;
-import com.chameleonvision.settings.SettingsManager;
 
 import java.net.SocketException;
 import java.util.ArrayList;
@@ -43,7 +43,7 @@ public class NetworkManager {
 			e.printStackTrace();
 		}
 
-        var teamBytes = NetworkManager.GetTeamNumberIPBytes(SettingsManager.generalSettings.teamNumber);
+        var teamBytes = NetworkManager.GetTeamNumberIPBytes(ConfigManager.settings.teamNumber);
 
         if (interfaces.size() > 0) {
 			for (var inetface : interfaces) {
@@ -85,7 +85,7 @@ public class NetworkManager {
 			return true;
 		}
 
-		var genSettings = SettingsManager.generalSettings;
+		var genSettings = ConfigManager.settings;
 		boolean isStatic = genSettings.connectionType.equals(NetworkIPMode.STATIC);
 
 		if (isStatic) {
diff --git a/Main/src/main/java/com/chameleonvision/vision/VisionProcess.java b/Main/src/main/java/com/chameleonvision/vision/VisionProcess.java
index 453e750af..1b9e8958c 100644
--- a/Main/src/main/java/com/chameleonvision/vision/VisionProcess.java
+++ b/Main/src/main/java/com/chameleonvision/vision/VisionProcess.java
@@ -61,7 +61,7 @@ public class VisionProcess {
 
         // Thread to grab frames from the camera
         // TODO: (HIGH) fix video modes!!!
-        this.cameraRunnable = new CameraFrameRunnable(cameraProcess.getProperties().videoModes.get(0).f ps);
+        this.cameraRunnable = new CameraFrameRunnable(cameraProcess.getProperties().videoModes.get(0).fps);
 
         lastPipelineResult = new DriverVisionPipeline.DriverPipelineResult(
                 null, cameraRunnable.getFrame(new Mat()), 0