diff --git a/include/SystemApplication.h b/include/SystemApplication.h
index 85c254b..1ab64a9 100644
--- a/include/SystemApplication.h
+++ b/include/SystemApplication.h
@@ -31,8 +31,8 @@
 #define REAST_API_DEBUG_MODE 0
 
 #define EXPECTED_MAX_DATA_RESPONSE_SIZE (4096)
-#define VAR_MAX_NAME_LENGTH 32
-#define VAR_MAX_VALUE_LENGTH 128
+#define VAR_MAX_NAME_LENGTH MAX_DYNVAR_NAME_LENGTH
+#define VAR_MAX_VALUE_LENGTH MAX_DYNVAR_LENGTH
 
 typedef enum
 {
diff --git a/src/SysComm.c b/src/SysComm.c
index 29e7e02..d3d051a 100644
--- a/src/SysComm.c
+++ b/src/SysComm.c
@@ -78,14 +78,14 @@ static esp_err_t SHA256hmacHash(unsigned char *data,
 }
 
 /*
-static void Timestamp(char *ts)
-{
-    struct timeval tp;
-    gettimeofday(&tp, NULL);
-    unsigned long long ms = (((unsigned long long) tp.tv_sec) * 1000000 + tp.tv_usec);
-    sprintf(ts, "%llu", ms);
-}
-*/
+ static void Timestamp(char *ts)
+ {
+ struct timeval tp;
+ gettimeofday(&tp, NULL);
+ unsigned long long ms = (((unsigned long long) tp.tv_sec) * 1000000 + tp.tv_usec);
+ sprintf(ts, "%llu", ms);
+ }
+ */
 
 static sys_error_code SysPayloadTypeVarsHandler(data_message_t *MSG)
 {