diff --git a/esp/bindings/SOAP/xpp/fxpp/FragmentedXmlPullParser.cpp b/esp/bindings/SOAP/xpp/fxpp/FragmentedXmlPullParser.cpp
index 377fa52d846..d67e6032e1c 100644
--- a/esp/bindings/SOAP/xpp/fxpp/FragmentedXmlPullParser.cpp
+++ b/esp/bindings/SOAP/xpp/fxpp/FragmentedXmlPullParser.cpp
@@ -216,13 +216,12 @@ class CFragmentedXmlPullParser : public IFragmentedXmlPullParser
                     }
                     else
                     {
-                        do
+                        for (uint8_t i=0; i<=laIndex; ++i)
                         {
-                            la = peekDataFrame(laIndex);
+                            la = peekDataFrame(i);
                             if (la)
                                 la->state = DataFrame::FrameIgnored;
                         }
-                        while (laIndex-- != 0);
                         pushFragment(injector.m_frame.getLink());
                     }
                 }
diff --git a/esp/services/ws_machine/ws_machineService.cpp b/esp/services/ws_machine/ws_machineService.cpp
index 64be460cc09..76271adc96c 100644
--- a/esp/services/ws_machine/ws_machineService.cpp
+++ b/esp/services/ws_machine/ws_machineService.cpp
@@ -499,7 +499,7 @@ void Cws_machineEx::setProcessRequest(CGetMachineInfoData& machineInfoData, Bool
             processTypeStr = processType;
     }
 
-    while (numIps--)
+    for (unsigned i=0; i<numIps; ++i)
     {
         unsigned numAddr;
         if (ipAddr.getNetAddress(sizeof(numAddr),&numAddr)!=sizeof(numAddr))