diff --git a/lib/memory.cpp b/lib/memory.cpp
index a51ce4253..fed012e2a 100644
--- a/lib/memory.cpp
+++ b/lib/memory.cpp
@@ -91,8 +91,8 @@ int memory_lock(size_t lock)
 
 		debug(LOG_MEM | 2, "Increased ressource limit of locked memory to %zd bytes", lock);
 	}
-#endif /* __arm__ */
 out:
+#endif /* __arm__ */
 #ifdef _POSIX_MEMLOCK
 	/* Lock all current and future memory allocations */
 	ret = mlockall(MCL_CURRENT | MCL_FUTURE);
diff --git a/lib/queue.cpp b/lib/queue.cpp
index 8f560a009..53c1893d7 100644
--- a/lib/queue.cpp
+++ b/lib/queue.cpp
@@ -57,9 +57,14 @@ int queue_init(struct queue *q, size_t size, struct memory_type *m)
 	for (size_t i = 0; i != size; i += 1)
 		std::atomic_store_explicit(&buffer[i].sequence, i, std::memory_order_relaxed);
 
+#ifndef __arm__
 	std::atomic_store_explicit(&q->tail, 0ul, std::memory_order_relaxed);
 	std::atomic_store_explicit(&q->head, 0ul, std::memory_order_relaxed);
+#else
+	std::atomic_store_explicit(&q->tail, 0u, std::memory_order_relaxed);
+	std::atomic_store_explicit(&q->head, 0u, std::memory_order_relaxed);
 
+#endif
 	q->state = STATE_INITIALIZED;
 
 	return 0;