diff --git a/wpilibc/src/main/native/cpp/ADXRS450_Gyro.cpp b/wpilibc/src/main/native/cpp/ADXRS450_Gyro.cpp
index 4d4b22dde3..37313a08d9 100644
--- a/wpilibc/src/main/native/cpp/ADXRS450_Gyro.cpp
+++ b/wpilibc/src/main/native/cpp/ADXRS450_Gyro.cpp
@@ -69,7 +69,7 @@ bool ADXRS450_Gyro::IsConnected() const {
   return m_connected;
 }
 
-static bool CalcParity(int v) {
+static bool CalcParity(uint32_t v) {
   bool parity = false;
   while (v != 0) {
     parity = !parity;
@@ -87,7 +87,7 @@ static inline int BytesToIntBE(uint8_t* buf) {
 }
 
 uint16_t ADXRS450_Gyro::ReadRegister(int reg) {
-  int cmd = 0x80000000 | static_cast<int>(reg) << 17;
+  uint32_t cmd = 0x80000000 | static_cast<int>(reg) << 17;
   if (!CalcParity(cmd)) {
     cmd |= 1u;
   }
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/SPI.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/SPI.java
index 73a0b23e0f..aedab28a30 100644
--- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/SPI.java
+++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/SPI.java
@@ -16,9 +16,9 @@ import java.nio.IntBuffer;
 public class SPI implements AutoCloseable {
   public enum Port {
     kOnboardCS0(SPIJNI.ONBOARD_CS0_PORT),
-    kOnboardCS1(SPIJNI.ONBOARD_CS0_PORT),
-    kOnboardCS2(SPIJNI.ONBOARD_CS0_PORT),
-    kOnboardCS3(SPIJNI.ONBOARD_CS0_PORT),
+    kOnboardCS1(SPIJNI.ONBOARD_CS1_PORT),
+    kOnboardCS2(SPIJNI.ONBOARD_CS2_PORT),
+    kOnboardCS3(SPIJNI.ONBOARD_CS3_PORT),
     kMXP(SPIJNI.MXP_PORT);
 
     public final int value;