diff --git a/source/utils/CarlaRingBuffer.hpp b/source/utils/CarlaRingBuffer.hpp
index 9cd7230883..efc165988b 100644
--- a/source/utils/CarlaRingBuffer.hpp
+++ b/source/utils/CarlaRingBuffer.hpp
@@ -155,7 +155,7 @@ class CarlaRingBufferControl
 
         const uint32_t wrap((fBuffer->tail > fBuffer->wrtn) ? 0 : fBuffer->size);
 
-        return wrap + fBuffer->tail - fBuffer->wrtn;
+        return wrap + fBuffer->tail - fBuffer->wrtn - 1;
     }
 
     // -------------------------------------------------------------------
diff --git a/source/utils/CarlaStateUtils.cpp b/source/utils/CarlaStateUtils.cpp
index 517989ce94..ec7e64b9b0 100644
--- a/source/utils/CarlaStateUtils.cpp
+++ b/source/utils/CarlaStateUtils.cpp
@@ -249,7 +249,7 @@ void CarlaStateSave::clear() noexcept
     }
 
     uniqueId = 0;
-    options  = 0x0;
+    options  = PLUGIN_OPTIONS_NULL;
 
 #ifndef BUILD_BRIDGE_ALTERNATIVE_ARCH
     active = false;