diff --git a/hermit/arch/x86/kernel/apic.c b/hermit/arch/x86/kernel/apic.c
index 2d7e9e98b..287673acf 100644
--- a/hermit/arch/x86/kernel/apic.c
+++ b/hermit/arch/x86/kernel/apic.c
@@ -789,7 +789,7 @@ static void apic_err_handler(struct state *s)
 
 void shutdown_system(void)
 {
-	int if_bootprocessor = (apic_processors[boot_processor]->id == apic_cpu_id());
+	int if_bootprocessor = (boot_processor == apic_cpu_id());
 
 	irq_disable();
 
diff --git a/hermit/include/hermit/tasks.h b/hermit/include/hermit/tasks.h
index a7da09d48..f11e2c4b3 100644
--- a/hermit/include/hermit/tasks.h
+++ b/hermit/include/hermit/tasks.h
@@ -228,7 +228,7 @@ int network_shutdown(void);
 void check_ticks(void);
 #endif
 
-volatile extern uint32_t go_down;
+extern volatile uint32_t go_down;
 
 /** @brief shutdown the hole system
  */