diff --git a/src/io/app/apax.yml b/src/io/app/apax.yml
index 5db7179d0..f64c738ce 100644
--- a/src/io/app/apax.yml
+++ b/src/io/app/apax.yml
@@ -68,6 +68,7 @@ scripts:
     - apax watch
   rr:
     - START=$(date +%s)
+    - apax clean
     - apax install
     - apax download
     - echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - Finished in
diff --git a/src/io/app/src/Documentation/ComponentWithDiagnostics.st b/src/io/app/src/Documentation/ComponentWithDiagnostics.st
index c11fdd265..8955ab487 100644
--- a/src/io/app/src/Documentation/ComponentWithDiagnostics.st
+++ b/src/io/app/src/Documentation/ComponentWithDiagnostics.st
@@ -11,7 +11,7 @@ CLASS ComponentWithDiagnostics EXTENDS AXOpen.Core.AxoComponent
     METHOD PUBLIC Run
         VAR_INPUT
             parent : IAxoObject;
-            _hwID : UINT;
+            _hwID : WORD;
         END_VAR    
 
         THIS.Initialize(parent);
diff --git a/src/io/ctrl/src/AxoIoComponent.st b/src/io/ctrl/src/AxoIoComponent.st
index 9b485e3d4..95b28e7e9 100644
--- a/src/io/ctrl/src/AxoIoComponent.st
+++ b/src/io/ctrl/src/AxoIoComponent.st
@@ -32,7 +32,7 @@ NAMESPACE AXOpen.Io
         METHOD PUBLIC Run
             VAR_INPUT
                 parent  : IAxoObject;
-                hwID    :   UINT;
+                hwID    :   WORD;
             END_VAR
             IF (parent = NULL) THEN RETURN; END_IF;
             THIS.Initialize(parent);    
@@ -46,7 +46,7 @@ NAMESPACE AXOpen.Io
         METHOD PUBLIC Run 
             VAR_INPUT
                 parent  : IAxoContext;
-                hwID    :   UINT;
+                hwID    :   WORD;
             END_VAR
             THIS.Initialize(parent);    
             THIS.Execute(hwID);           
@@ -54,7 +54,7 @@ NAMESPACE AXOpen.Io
         
         METHOD PRIVATE Execute
             VAR_INPUT
-                hwID    :   UINT;
+                hwID    :   WORD;
             END_VAR
             VAR
                 diagInfo : Siemens.Simatic.S71500.Diagnostics.Hardware.DiagnosticDetails;            
@@ -63,7 +63,7 @@ NAMESPACE AXOpen.Io
             UpdateHardwareDiagnosticsTask.Initialize(THIS);
 
             IF UpdateHardwareDiagnosticsTask.Execute() THEN
-                GetDiagnosticsReturnCode := GetDiagnostics(hwID, diagInfo);
+                GetDiagnosticsReturnCode := GetDiagnostics(TO_UINT(hwID), diagInfo);
                 UpdateHardwareDiagnosticsTask.DoneWhen(UpdateHardwareDiagnosticsTask.Duration >= T#250ms AND GetDiagnosticsReturnCode=GetDiagnosticsReturnCode#NoError);
                 UpdateHardwareDiagnosticsTask.ThrowWhen(UpdateHardwareDiagnosticsTask.Duration >= T#250ms AND GetDiagnosticsReturnCode<>GetDiagnosticsReturnCode#NoError);
             END_IF;