diff --git a/libdfa/statemachine.h b/libdfa/statemachine.h
index 3a7be76..f3f5e86 100644
--- a/libdfa/statemachine.h
+++ b/libdfa/statemachine.h
@@ -47,7 +47,7 @@ terms specified in this license.
 #include <time.h>
 #include <lladd/transactional.h>
 #include <libdfa/messages.h>
-#include "../lladd/src/lladd/page.h"
+#include "../src/lladd/page.h"
 #include <sys/types.h>
 #include <pthread.h>
 
diff --git a/test/lladd/check_logWriter.c b/test/lladd/check_logWriter.c
index c76f3e1..0d38465 100644
--- a/test/lladd/check_logWriter.c
+++ b/test/lladd/check_logWriter.c
@@ -157,9 +157,9 @@ END_TEST
 
 START_TEST(logHandleColdReverseIterator) {
   LogEntry * e;
+  setup_log();
   LogHandle lh = getLogHandle();
   int i = 0;
-  setup_log();
 
 
   while(((e = nextInLog(&lh)) && (i < 100)) ) {
@@ -190,10 +190,10 @@ START_TEST(logWriterTruncate) {
   LogEntry * le2;
   LogEntry * le3 = NULL;
   LogEntry * tmp;
+  setup_log();
 
   LogHandle lh = getLogHandle();
   int i = 0;
-  setup_log();
 
   while(i < 234) {
     i++;