Index: firmware/App/Controllers/ROPump.c
===================================================================
diff -u -r448380e449ec483a49c099ad326fbc898b614a09 -r5d505b326ee2b7341ff068be90180ab02e92ea51
--- firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 448380e449ec483a49c099ad326fbc898b614a09)
+++ firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 5d505b326ee2b7341ff068be90180ab02e92ea51)
@@ -698,6 +698,7 @@
                 break;
         }
     }
+
     return dutyCyclePct;
 }
 
Index: firmware/App/Controllers/Valves.c
===================================================================
diff -u -r1b4bfcbd5295bfb41779bdcff97317db5ced9d6a -r5d505b326ee2b7341ff068be90180ab02e92ea51
--- firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 1b4bfcbd5295bfb41779bdcff97317db5ced9d6a)
+++ firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 5d505b326ee2b7341ff068be90180ab02e92ea51)
@@ -578,9 +578,9 @@
  * @param recovery state to set valve config.
  * @return none.
  *************************************************************************/
-void setRecoveryStatesConfig( U32 recovery )
+void setRecoveryStatesConfig( RECOVERY_STATE_T recovery )
 {
-    recoveryState = (RECOVERY_STATE_T)recovery;
+    recoveryState = recovery;
 }
 /*********************************************************************//**
  * @brief
@@ -905,6 +905,7 @@
 BOOL testIOFPSetValveRecoveryConfig( MESSAGE_T *message )
 {
     BOOL result = FALSE;
+
     // Verify tester has logged in with DD
     if ( TRUE == isTestingActivated() )
     {
@@ -917,7 +918,7 @@
 
             if (payload < NUM_OF_RECOVERY_STATES )
             {
-                setRecoveryStatesConfig(payload);
+                setRecoveryStatesConfig((RECOVERY_STATE_T)payload);
                 result = TRUE;
             }
         }
Index: firmware/App/Controllers/Valves.h
===================================================================
diff -u -r448380e449ec483a49c099ad326fbc898b614a09 -r5d505b326ee2b7341ff068be90180ab02e92ea51
--- firmware/App/Controllers/Valves.h	(.../Valves.h)	(revision 448380e449ec483a49c099ad326fbc898b614a09)
+++ firmware/App/Controllers/Valves.h	(.../Valves.h)	(revision 5d505b326ee2b7341ff068be90180ab02e92ea51)
@@ -83,7 +83,7 @@
 void setHydValvesStatetoClosedState( void );
 void setRecoveryValvesConfig( void );
 RECOVERY_STATE_T getRecoveryStatesConfig( void );
-void setRecoveryStatesConfig( U32 recovery );
+void setRecoveryStatesConfig( RECOVERY_STATE_T recovery );
 
 BOOL testValvesStatesPublishIntervalOverride( MESSAGE_T *message );
 BOOL testValveStateOverride( MESSAGE_T *message );
Index: firmware/App/Services/FpgaDD.c
===================================================================
diff -u -r1b4bfcbd5295bfb41779bdcff97317db5ced9d6a -r5d505b326ee2b7341ff068be90180ab02e92ea51
--- firmware/App/Services/FpgaDD.c	(.../FpgaDD.c)	(revision 1b4bfcbd5295bfb41779bdcff97317db5ced9d6a)
+++ firmware/App/Services/FpgaDD.c	(.../FpgaDD.c)	(revision 5d505b326ee2b7341ff068be90180ab02e92ea51)
@@ -61,7 +61,7 @@
 
 #define FPGA_EXPECTED_ID                0x06                    ///< FPGA expected ID for Beta 2 systems.
 //TODO: Remove once Beta 1.9 is obsolete
-#define FPGA_BETA_1_9_EXPECTED_ID       0X08                    ///< FPGA expected ID for Beta 1.9 systems.
+#define FPGA_BETA_1_9_EXPECTED_ID       0x08                    ///< FPGA expected ID for Beta 1.9 systems.
 #define FPGA_BETA_1_0_EXPECTED_ID       0x04                    ///< FPGA expected ID for Beta 1.0 systems.
 
 #define MAX_COMM_ERROR_RETRIES          5                       ///< Maximum number of communication error retries