diff --git a/source/RobotAPI/gui-plugins/KinematicUnitPlugin/KinematicUnitGuiPlugin.cpp b/source/RobotAPI/gui-plugins/KinematicUnitPlugin/KinematicUnitGuiPlugin.cpp
index d0de2a9a63bb1805b60da8f41e1725f7c0e8f2a7..fa112d73518188a54a796ff47e871d106cb83370 100644
--- a/source/RobotAPI/gui-plugins/KinematicUnitPlugin/KinematicUnitGuiPlugin.cpp
+++ b/source/RobotAPI/gui-plugins/KinematicUnitPlugin/KinematicUnitGuiPlugin.cpp
@@ -648,7 +648,8 @@ namespace armarx
     {
         const auto selectedControlMode = getSelectedControlMode();
 
-        if (selectedControlMode == eVelocityControl || selectedControlMode == eTorqueControl || selectedControlMode == eCurrentControl)
+        if (selectedControlMode == eVelocityControl || selectedControlMode == eTorqueControl ||
+            selectedControlMode == eCurrentControl)
         {
             resetSliderToZeroPosition();
         }
@@ -686,7 +687,8 @@ namespace armarx
     {
         const auto selectedControlMode = getSelectedControlMode();
 
-        if (selectedControlMode == eVelocityControl || selectedControlMode == eTorqueControl || selectedControlMode == eCurrentControl)
+        if (selectedControlMode == eVelocityControl || selectedControlMode == eTorqueControl ||
+            selectedControlMode == eCurrentControl)
         {
             ui.horizontalSliderKinematicUnitPos->setSliderPosition(SLIDER_ZERO_POSITION);
             ui.lcdNumberKinematicUnitJointValue->display(SLIDER_ZERO_POSITION);
@@ -933,7 +935,6 @@ namespace armarx
         }
     }
 
-
     void
     KinematicUnitWidgetController::setControlModeTorque()
     {
@@ -972,7 +973,6 @@ namespace armarx
         }
     }
 
-
     void
     KinematicUnitWidgetController::setControlModeCurrent()
     {
@@ -995,8 +995,8 @@ namespace armarx
 
 
             /* Limits for current control in mA*/
-            const float lo = -2000;
-            const float hi = 2000;
+            const int lo = -2000;
+            const int hi = 2000;
 
             try
             {
@@ -1415,8 +1415,8 @@ namespace armarx
             auto it = reportedJointStatuses.find(rn[i]->getName());
             if (it == reportedJointStatuses.end())
             {
-                ARMARX_WARNING << deactivateSpam(5, rn[i]->getName()) << "Joint Status for " << rn[i]->getName()
-                               << " was not reported!";
+                ARMARX_WARNING << deactivateSpam(5, rn[i]->getName()) << "Joint Status for "
+                               << rn[i]->getName() << " was not reported!";
                 continue;
             }
             JointStatus currentStatus = it->second;