diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index db4febed018..cfef4fa14ba 100644
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -1685,7 +1685,7 @@ try_again:
 }
 /* }}} */
 
-static void zend_collect_module_handlers(void) /* {{{ */
+static void zend_collect_module_handlers(TSRMLS_D) /* {{{ */
 {
 	HashPosition pos;
 	zend_module_entry *module;
@@ -1767,7 +1767,7 @@ ZEND_API int zend_startup_modules(TSRMLS_D) /* {{{ */
 {
 	zend_hash_sort(&module_registry, zend_sort_modules, NULL, 0 TSRMLS_CC);
 	zend_hash_apply(&module_registry, (apply_func_t)zend_startup_module_ex TSRMLS_CC);
-	zend_collect_module_handlers();
+	zend_collect_module_handlers(TSRMLS_C);
 	return SUCCESS;
 }
 /* }}} */
diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h
index 91474266987..d880eb7186b 100644
--- a/Zend/zend_compile.h
+++ b/Zend/zend_compile.h
@@ -616,7 +616,7 @@ ZEND_API void zend_destroy_file_handle(zend_file_handle *file_handle TSRMLS_DC);
 ZEND_API int zend_cleanup_class_data(zend_class_entry **pce TSRMLS_DC);
 ZEND_API int zend_cleanup_user_class_data(zend_class_entry **pce TSRMLS_DC);
 ZEND_API void zend_cleanup_internal_class_data(zend_class_entry *ce TSRMLS_DC);
-ZEND_API void zend_cleanup_internal_classes(TSRMLS_C);
+ZEND_API void zend_cleanup_internal_classes(TSRMLS_D);
 ZEND_API int zend_cleanup_function_data(zend_function *function TSRMLS_DC);
 ZEND_API int zend_cleanup_function_data_full(zend_function *function TSRMLS_DC);
 
diff --git a/Zend/zend_opcode.c b/Zend/zend_opcode.c
index a1e70ef8fc7..a0d82e1963e 100644
--- a/Zend/zend_opcode.c
+++ b/Zend/zend_opcode.c
@@ -190,7 +190,7 @@ static inline void cleanup_internal_class_data(zend_class_entry *ce TSRMLS_DC)
 		}
 		efree(CE_STATIC_MEMBERS(ce));
 #ifdef ZTS
-		CG(static_members_table)[(zend_intptr_t)((ce->static_members_table)] = NULL;
+		CG(static_members_table)[(zend_intptr_t)(ce->static_members_table)] = NULL;
 #else
 		ce->static_members_table = NULL;
 #endif