Index: NVDataMgmt.c
===================================================================
diff -u -r9d9e5e0004ab2aa094d035f2ee7ad2bdd0820a54 -r6d98aaf38c1fc7381611fd69959b0c9116f1be4f
--- NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 9d9e5e0004ab2aa094d035f2ee7ad2bdd0820a54)
+++ NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 6d98aaf38c1fc7381611fd69959b0c9116f1be4f)
@@ -1039,7 +1039,7 @@
         case GET_CAL_HEPARIN_FORCE_SENSOR:
             nvDataStartPtr = (U08*)&hdCalibrationRecord.hdCalibrationGroups.heparinForceSensorCalRecord;
             nvDataLength   = sizeof( hdCalibrationRecord.hdCalibrationGroups.heparinForceSensorCalRecord );
-            isNVDataValid  = ( 0 == hdCalibrationRecord.hdCalibrationGroups.heparinForceSensorCalRecord.hdHeparinForceSensor.calibrationTime ? FALSE : TRUE );
+            isNVDataValid  = ( 0 == hdCalibrationRecord.hdCalibrationGroups.heparinForceSensorCalRecord.calibrationTime ? FALSE : TRUE );
             break;
 
         case GET_CAL_PUMPS:
@@ -1935,7 +1935,9 @@
 #ifdef _HD_
     haveCalGroupsPassed     = isHDCalibrationRecordValid();
     hasSystemRecordPassed   = isHDSystemRecordValid();
+#ifndef BOARD_WITH_NO_HARDWARE
     hasServiceRecordPassed  = isHDServiceRecordValid();
+#endif
 #ifndef _RELEASE_
     hasSWConfigRecordPassed = isSWConfigRecordValid();
 #endif
@@ -3868,7 +3870,7 @@
     }
 
     HD_HEPARIN_FORCE_SENSOR_CAL_RECORD_T* heparinForce = &hdCalibrationRecord.hdCalibrationGroups.heparinForceSensorCalRecord;
-    record = (POLYNOMIAL_CAL_PAYLOAD_T*)&heparinForce->hdHeparinForceSensor;
+    record = (POLYNOMIAL_CAL_PAYLOAD_T*)&heparinForce->hdHeparinForceSensorDACVoltage;
     isHardwareRecordValid = isPolynomialRecordValid( record );
     isCalRecordValid = isCalRecordValid == FALSE ? FALSE : isHardwareRecordValid;