diff --git a/testcode/checklocks.c b/testcode/checklocks.c
index 6d1ac9c83..f8e896901 100644
--- a/testcode/checklocks.c
+++ b/testcode/checklocks.c
@@ -63,7 +63,7 @@ static ub_thread_key_t thr_debug_key;
 /** the list of threads, so all threads can be examined. NULL if unused. */
 static struct thr_check* thread_infos[THRDEBUG_MAX_THREADS];
 /** do we check locking order */
-int check_locking_order = 1;
+int check_locking_order = 0;
 /** the pid of this runset, reasonably unique. */
 static pid_t check_lock_pid;
 
diff --git a/util/region-allocator.c b/util/region-allocator.c
index d4753bb7d..daa1c0a89 100644
--- a/util/region-allocator.c
+++ b/util/region-allocator.c
@@ -50,7 +50,7 @@
 /** increase size until it fits alignment of s bytes */
 #define ALIGN_UP(x, s)     (((x) + s - 1) & (~(s - 1)))
 /** what size to align on */
-#define ALIGNMENT          (sizeof(void *))
+#define ALIGNMENT          (sizeof(uint64_t))
 /** set to 1 to perform expensive check for double recycle() */
 #define CHECK_DOUBLE_FREE 0