diff --git a/src/arduino_homekit_server_esp32.cpp b/src/arduino_homekit_server_esp32.cpp
index 757168a..2627a16 100644
--- a/src/arduino_homekit_server_esp32.cpp
+++ b/src/arduino_homekit_server_esp32.cpp
@@ -3436,7 +3436,7 @@ void homekit_server_init(homekit_server_config_t *config) {
 	if (!server->paired) {
 		if (!arduino_homekit_preinit(server)) {
 			ERROR("Error in arduino_homekit_preinit, please check and retry");
-			system_restart();
+			esp_restart();
 			return;
 		}
 	}
diff --git a/src/homekit/types.h b/src/homekit/types.h
index 1546b71..e29718f 100644
--- a/src/homekit/types.h
+++ b/src/homekit/types.h
@@ -359,7 +359,7 @@ bool homekit_characteristic_has_notify_callback(
 //=========================
 homekit_value_t HOMEKIT_NULL_CPP();
 homekit_value_t HOMEKIT_BOOL_CPP(bool value) ;
-homekit_value_t HOMEKIT_INT_CPP(uint8_t value);
+homekit_value_t HOMEKIT_INT_CPP(int value);
 homekit_value_t HOMEKIT_UINT8_CPP(uint8_t value);
 homekit_value_t HOMEKIT_UINT16_CPP(uint16_t value);
 homekit_value_t HOMEKIT_UINT32_CPP(uint32_t value);
diff --git a/src/homekit_debug.h b/src/homekit_debug.h
index 109b72a..b7f1bca 100644
--- a/src/homekit_debug.h
+++ b/src/homekit_debug.h
@@ -37,8 +37,8 @@ static uint32_t start_time = 0;
 
 #define INFO(message, ...) HOMEKIT_PRINTF(">>> [" MILLIS_FMT "] HomeKit: " message "\n", millis(), ##__VA_ARGS__)
 #define ERROR(message, ...) HOMEKIT_PRINTF("!!! [" MILLIS_FMT "] HomeKit: " message "\n", millis(), ##__VA_ARGS__)
-#define INFO_HEAP() INFO("Free heap: %u", system_get_free_heap_size());
-#define DEBUG_HEAP() DEBUG("Free heap: %u", system_get_free_heap_size());
+#define INFO_HEAP() INFO("Free heap: %u", esp_get_free_heap_size());
+#define DEBUG_HEAP() DEBUG("Free heap: %u", esp_get_free_heap_size());
 static unsigned long start_time = 0;
 #define DEBUG_TIME_BEGIN()  start_time=millis();
 #define DEBUG_TIME_END(func_name)  HOMEKIT_PRINTF("### [" MILLIS_FMT "] %s took "  MILLIS_FMT "ms\n", millis(), func_name, (millis() - start_time));
diff --git a/src/types.c b/src/types.c
index 4a51751..dbdcab9 100644
--- a/src/types.c
+++ b/src/types.c
@@ -23,7 +23,7 @@ homekit_value_t HOMEKIT_BOOL_CPP(bool value) {
 	return homekit_value;
 }
 
-homekit_value_t HOMEKIT_INT_CPP(uint8_t value) {
+homekit_value_t HOMEKIT_INT_CPP(int value) {
 	homekit_value_t homekit_value = HOMEKIT_DEFAULT_CPP();
 	homekit_value.format = homekit_format_int;
 	homekit_value.int_value = value;