diff --git a/src/shared/utils/MovingAverage.h b/src/shared/utils/MovingAverage.h
index bea0055dd479381b144d11fa2d435c3200a1c41e..28bfe5c9bad38779bcd85444fa4e16bbb0f76d2a 100644
--- a/src/shared/utils/MovingAverage.h
+++ b/src/shared/utils/MovingAverage.h
@@ -39,7 +39,7 @@ public:
     {
         T average = 0;
 
-        for (size_t i = 0; i < buffer.getSize(); i++)
+        for (size_t i = 0; i < buffer.count(); i++)
             average += buffer.get(i);
 
         return average / buffer.getSize();
diff --git a/src/shared/utils/collections/CircularBuffer.h b/src/shared/utils/collections/CircularBuffer.h
index 6182bdcc5b7967af9b90570dada7d62c635438ce..d33db5ff619c8da12732483dfbdeabb24c9fad57 100644
--- a/src/shared/utils/collections/CircularBuffer.h
+++ b/src/shared/utils/collections/CircularBuffer.h
@@ -86,7 +86,7 @@ public:
             return buffer[ptr];
         }
         else
-            throw range_error("Index out of range");
+            throw range_error("Circular buffer index out of range");
     }
 
     /**
@@ -117,7 +117,7 @@ public:
             return buffer[ptr];
         }
         else
-            throw range_error("CircularBuffer is empty!");
+            throw range_error("Circular buffer is empty!");
     }
 
     /**