Index: kernel/generic/src/lib/halt.c
===================================================================
--- kernel/generic/src/lib/halt.c	(revision 7d83c54306318dee6c21d2db3c3085efd2eee1ce)
+++ kernel/generic/src/lib/halt.c	(revision 3e6bca8e30f09268060ae3e4db1f0a3d721f5730)
@@ -36,4 +36,5 @@
  */
 
+#include <stdbool.h>
 #include <halt.h>
 #include <log.h>
@@ -44,5 +45,5 @@
 
 /** Halt flag */
-atomic_t haltstate = 0;
+atomic_bool haltstate = false;
 
 /** Halt wrapper
@@ -57,9 +58,9 @@
 
 	if (!atomic_load(&haltstate)) {
-		atomic_store(&haltstate, 1);
+		atomic_store(&haltstate, true);
 		rundebugger = true;
 	}
 #else
-	atomic_store(&haltstate, 1);
+	atomic_store(&haltstate, true);
 #endif
 
Index: kernel/generic/src/proc/scheduler.c
===================================================================
--- kernel/generic/src/proc/scheduler.c	(revision 7d83c54306318dee6c21d2db3c3085efd2eee1ce)
+++ kernel/generic/src/proc/scheduler.c	(revision 3e6bca8e30f09268060ae3e4db1f0a3d721f5730)
@@ -68,5 +68,5 @@
 static void scheduler_separated_stack(void);
 
-atomic_t nrdy;  /**< Number of ready threads in the system. */
+atomic_size_t nrdy;  /**< Number of ready threads in the system. */
 
 /** Carry out actions before new task runs. */