Index: firmware/App/Modes/ModeGenPermeate.c
===================================================================
diff -u -reaeaf0d0c58e85a0a2718661c0964e8c0336f9fc -r709198d46039f3bd6e9fd62b291e6856e5ebd553
--- firmware/App/Modes/ModeGenPermeate.c	(.../ModeGenPermeate.c)	(revision eaeaf0d0c58e85a0a2718661c0964e8c0336f9fc)
+++ firmware/App/Modes/ModeGenPermeate.c	(.../ModeGenPermeate.c)	(revision 709198d46039f3bd6e9fd62b291e6856e5ebd553)
@@ -117,7 +117,7 @@
             genPermeateState = handleGenPWaterFullState();
             break;
         default:
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_OP_MODES_INVALID_MODE_STATE, state )
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_RO_INVALID_GENP_STATE, state )
             break;:
 
     }
@@ -209,18 +209,18 @@
     if (LEVEL_STATE_LOW == level )
     {
         // TODO: Trigger fault alarm. Turn off heater.
-        // TODO: We need to wait for tank to fill to medium
+        // TODO: We need to wait for tank to fill to medium.
     }
 
-    else if ( ( LEVEL_STATE_HIGH == level ) )
+    else if ( LEVEL_STATE_HIGH == level )
     {
         setModeGenPStateTransition( RO_GENP_WATER_FULL_STATE );
         state = RO_GENP_WATER_FULL_STATE;
     }
 
     else if ( LEVEL_STATE_MEDIUM == level )
     {
-        // expected state. Need to monitor?
+        // expected state. No action required.
     }
 
     return state;
Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -reaeaf0d0c58e85a0a2718661c0964e8c0336f9fc -r709198d46039f3bd6e9fd62b291e6856e5ebd553
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision eaeaf0d0c58e85a0a2718661c0964e8c0336f9fc)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 709198d46039f3bd6e9fd62b291e6856e5ebd553)
@@ -46,7 +46,7 @@
 void initStandbyMode( void )
 {
     standbyState = RO_STANDBY_MODE_STATE_IDLE;
-    pendingStartRORequest                   = FALSE;
+    pendingStartRORequest               = FALSE;
 }
 
 /*********************************************************************//**
Index: firmware/App/Services/AlarmMgmtSWFaults.h
===================================================================
diff -u -r834e2f1c57b828c546c56dea42a9757988e16314 -r709198d46039f3bd6e9fd62b291e6856e5ebd553
--- firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision 834e2f1c57b828c546c56dea42a9757988e16314)
+++ firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision 709198d46039f3bd6e9fd62b291e6856e5ebd553)
@@ -126,6 +126,7 @@
     SW_FAULT_ID_INVALID_TEMPERATURE_SENSOR_SELECTED1 = 109,
     SW_FAULT_ID_INVALID_TEMPERATURE_SENSOR_SELECTED2 = 110,
     SW_FAULT_ID_HEATER_INVALID_EXEC_STATE = 111,
+    SW_FAULT_ID_RO_INVALID_GENP_STATE = 112,
     NUM_OF_SW_FAULT_IDS
 } SW_FAULT_ID_T;