diff --git a/Makefile b/Makefile
index b223871..a539baa 100644
--- a/Makefile
+++ b/Makefile
@@ -99,7 +99,7 @@ print-%: ; @echo $* = $($*)
 
 test1: all
 	@echo "[threadpool]\n\nquantity = 1\npending = 10\n\n[files]\n\nMaxFiles = 10000\nMaxSize = 128000\n\n[log]\n\nlogFile = ./logs/l.log\n\n[socket]\n\nname = ./socket\nbacklog = 100\n" > build/confix.txt
-	valgrind --leak-check=full ./server &
+	valgrind --leak-check=full --track-origins=yes $(BUILD_DIR)/server &
 	bash scripts/test1.sh
 	pkill -1 memcheck-amd64
 
diff --git a/lib/api/api.c b/lib/api/api.c
index 7cf539d..4be63a7 100644
--- a/lib/api/api.c
+++ b/lib/api/api.c
@@ -37,20 +37,21 @@
 
 
 
+#define printOpenedFiles(str) \
 
 
-#define printOpenedFiles(str)						\
-    fprintf(stdout, "\nInside of function: %s\n", __func__);		\
-    fprintf(stdout, "\t[%s]\n", str);					\
-    fprintf(stdout, "\tcreatedAndlocked: %s\n", openedFiles->createdAndLocked);	\
-    fprintf(stdout, "\tf: %p\n", (void *)openedFiles->f);		\
-    fprintf(stdout, "\tnumOfFiles: %d\n", openedFiles->numOfFiles);	\
-    fprintf(stdout, "\tout: %p\n", (void *)openedFiles->out);		\
-    fprintf(stdout, "\tvalidrDir: %d\n", openedFiles->validrDir);	\
-    fprintf(stdout, "\trDir: %p\n", (void *)openedFiles->rDir);		\
-    fprintf(stdout, "\tvalidwDir: %d\n", openedFiles->validwDir);	\
-    fprintf(stdout, "\twDir: %p\n", (void *)openedFiles->wDir);		\
-    fflush(stdout);							\
+/* #define printOpenedFiles(str)						\ */
+/*     fprintf(stdout, "\nInside of function: %s\n", __func__);		\ */
+/*     fprintf(stdout, "\t[%s]\n", str);					\ */
+/*     fprintf(stdout, "\tcreatedAndlocked: %s\n", openedFiles->createdAndLocked);	\ */
+/*     fprintf(stdout, "\tf: %p\n", (void *)openedFiles->f);		\ */
+/*     fprintf(stdout, "\tnumOfFiles: %d\n", openedFiles->numOfFiles);	\ */
+/*     fprintf(stdout, "\tout: %p\n", (void *)openedFiles->out);		\ */
+/*     fprintf(stdout, "\tvalidrDir: %d\n", openedFiles->validrDir);	\ */
+/*     fprintf(stdout, "\trDir: %p\n", (void *)openedFiles->rDir);		\ */
+/*     fprintf(stdout, "\tvalidwDir: %d\n", openedFiles->validwDir);	\ */
+/*     fprintf(stdout, "\twDir: %p\n", (void *)openedFiles->wDir);		\ */
+/*     fflush(stdout);							\ */
 
 
 
@@ -1691,7 +1692,7 @@ int closeEveryFile() {
 }
 
 int createOpenedFiles(void) {
-    openedFiles = calloc(1, sizeof(openfiles_t));
+    openedFiles = calloc(1, sizeof(*openedFiles));
     if(!openedFiles) {
 	perror("calloc");
 	return -1;
diff --git a/src/server.c b/src/server.c
index 6d5a015..dbae2cc 100644
--- a/src/server.c
+++ b/src/server.c
@@ -233,9 +233,9 @@ int main(int argc, char *argv[]) {
 	    goto _cleanup;
 	}
 	// cerchiamo di capire da quale fd abbiamo ricevuto una richiesta
-	for(int i=0; i <= fdmax; ++i) {
+	for(long i=0; i <= fdmax; ++i) {
 	    if (FD_ISSET(i, &tmpset)) {
-		int* connfd = malloc(sizeof(long));
+		long* connfd = malloc(sizeof(long));
 		if (!connfd) {
 		    perror("ERROR FATAL malloc");
 		    goto _cleanup;