diff --git a/package.xml b/package.xml
index 1acb7c73..5565863e 100644
--- a/package.xml
+++ b/package.xml
@@ -41,26 +41,16 @@ http://pear.php.net/dtd/package-2.0.xsd">
  </lead>
  <date>2024-10-17</date>
  <version>
-  <release>3.3.0</release>
+  <release>3.3.1dev</release>
   <api>3.3.0</api>
  </version>
  <stability>
-  <release>stable</release>
+  <release>beta</release>
   <api>stable</api>
  </stability>
  <license uri="http://www.php.net/license">PHP</license>
  <notes>
-- Add #515 option to locally enforce payload size limit
-- Add #539 zstd support
-- Add #540 compression_level option
-- Mark password as a sensitive param for PHP 8.2
-- Upgrade Windows libmemcached to v1.1.4
-- Fix Windows PHP 8 compatibility
-- Fix #518 Windows msgpack support
-- Fix #522 signed integer overflow
-- Fix #523 incorrect PHP reflection type for Memcached::cas $cas_token
-- Fix #546 don't check key automatically, unless client-side verify_key is enabled
-- Fix #555 incompatible pointer types (32-bit)
+-
  </notes>
  <contents>
   <dir name="/">
@@ -231,6 +221,31 @@ http://pear.php.net/dtd/package-2.0.xsd">
   <configureoption name="enable-memcached-session"  prompt="enable sessions"            default="yes"/>
  </extsrcrelease>
  <changelog>
+  <release>
+   <date>2024-10-17</date>
+   <version>
+    <release>3.3.0</release>
+    <api>3.3.0</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://www.php.net/license">PHP</license>
+   <notes>
+- Add #515 option to locally enforce payload size limit
+- Add #539 zstd support
+- Add #540 compression_level option
+- Mark password as a sensitive param for PHP 8.2
+- Upgrade Windows libmemcached to v1.1.4
+- Fix Windows PHP 8 compatibility
+- Fix #518 Windows msgpack support
+- Fix #522 signed integer overflow
+- Fix #523 incorrect PHP reflection type for Memcached::cas $cas_token
+- Fix #546 don't check key automatically, unless client-side verify_key is enabled
+- Fix #555 incompatible pointer types (32-bit)
+     </notes>
+    </release>
     <release>
      <date>2022-03-24</date>
      <version>
diff --git a/php_memcached.c b/php_memcached.c
index c8abb844..b78eb82a 100644
--- a/php_memcached.c
+++ b/php_memcached.c
@@ -3961,7 +3961,7 @@ zend_class_entry *php_memc_get_exception_base(int root)
 		}
 	}
 
-	return zend_exception_get_default();
+	return zend_ce_exception;
 }
 
 
diff --git a/php_memcached.h b/php_memcached.h
index 905f941d..dfd19185 100644
--- a/php_memcached.h
+++ b/php_memcached.h
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#define PHP_MEMCACHED_VERSION "3.3.0"
+#define PHP_MEMCACHED_VERSION "3.3.1dev"
 
 #if defined(PHP_WIN32) && defined(MEMCACHED_EXPORTS)
 #define PHP_MEMCACHED_API __declspec(dllexport)
diff --git a/php_memcached_private.h b/php_memcached_private.h
index 2c22ecba..b7d2a5e1 100644
--- a/php_memcached_private.h
+++ b/php_memcached_private.h
@@ -43,7 +43,11 @@
 #include <ext/standard/info.h>
 #include <zend_extensions.h>
 #include <zend_exceptions.h>
+#if PHP_VERSION_ID < 70200
 #include <ext/standard/php_smart_string.h>
+#else
+#include <Zend/zend_smart_string.h>
+#endif
 #include <ext/standard/php_var.h>
 #include <ext/standard/basic_functions.h>