Index: NVDataMgmt.c
===================================================================
diff -u -r275af898eca92aafd2d8b0c8d3d02fa9abb7de40 -r000143fea63769e38925bd939847b43091f85332
--- NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 275af898eca92aafd2d8b0c8d3d02fa9abb7de40)
+++ NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 000143fea63769e38925bd939847b43091f85332)
@@ -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:
@@ -1950,7 +1950,9 @@
 #ifdef _HD_
     haveCalGroupsPassed     = isHDCalibrationRecordValid();
     hasSystemRecordPassed   = isHDSystemRecordValid();
+#ifndef BOARD_WITH_NO_HARDWARE
     hasServiceRecordPassed  = isHDServiceRecordValid();
+#endif
 #ifndef _RELEASE_
     hasSWConfigRecordPassed = isSWConfigRecordValid();
 #endif
@@ -1978,6 +1980,8 @@
     if ( ( TRUE == haveCalGroupsPassed ) && ( TRUE == haveRecordsPassed ) &&
          ( TRUE == hasSystemRecordPassed ) && ( TRUE == hasServiceRecordPassed ) )
     {
+        newCalStartTimer         = getMSTimerCount();
+        isNewCalAvailable        = TRUE;
         nvDataMgmtSelfTestResult = SELF_TEST_STATUS_PASSED;
     }
     else
@@ -3883,7 +3887,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;