Index: sources/gui/qml/pages/treatment/TreatmentHeparin.qml
===================================================================
diff -u -rbce1e6f584c921c9fa6945204ed1e1d38021fbc8 -rc369e34e8864b8b7a7bca07b77f5d3a41701ffbf
--- sources/gui/qml/pages/treatment/TreatmentHeparin.qml	(.../TreatmentHeparin.qml)	(revision bce1e6f584c921c9fa6945204ed1e1d38021fbc8)
+++ sources/gui/qml/pages/treatment/TreatmentHeparin.qml	(.../TreatmentHeparin.qml)	(revision c369e34e8864b8b7a7bca07b77f5d3a41701ffbf)
@@ -145,7 +145,7 @@
                             anchors.centerIn: parent
                             color           : Colors.offWhite
                             font.pixelSize  : Fonts.fontPixelHeparin
-                            text            : _root.deliveryOff ? "OFF" :   index === TreatmentHeparin.DispensingRate ||
+                            text            : _root.deliveryOff ? qsTr("OFF") :   index === TreatmentHeparin.DispensingRate ||
                                                                             index === TreatmentHeparin.BolusVolume ?     _root.values[index].toFixed(Variables.heparinPrecision) :
                                                                                                                          _root.values[index]
                         }
Index: sources/view/hd/data/VTreatmentRanges.cpp
===================================================================
diff -u -rde099919f262c3429cb0592ef71deb6a16e92892 -rc369e34e8864b8b7a7bca07b77f5d3a41701ffbf
--- sources/view/hd/data/VTreatmentRanges.cpp	(.../VTreatmentRanges.cpp)	(revision de099919f262c3429cb0592ef71deb6a16e92892)
+++ sources/view/hd/data/VTreatmentRanges.cpp	(.../VTreatmentRanges.cpp)	(revision c369e34e8864b8b7a7bca07b77f5d3a41701ffbf)
@@ -173,6 +173,7 @@
     bloodPressureMeasureInterval        ( _Settings.keys(mCategory          , "Vitals Measurement Interval Options"                                                                  ));
 
     isConfigsOk = isConfigsOk && !_heparinTypeOptions           .isEmpty();
+    if ( _heparinTypeOptions.isEmpty() ) { heparinTypeOptions({"-- --"}); }
     isConfigsOk = isConfigsOk && !_acidConcentrateOptions       .isEmpty();
     isConfigsOk = isConfigsOk && !_bicarbonateConcentrateOptions.isEmpty();
     isConfigsOk = isConfigsOk && !_dialyzerTypeOptions          .isEmpty();