diff --git a/Architecture/amd64/cpu/AdvancedProgrammableInterruptController.cpp b/Architecture/amd64/cpu/AdvancedProgrammableInterruptController.cpp
index 551b405..f685dc9 100644
--- a/Architecture/amd64/cpu/AdvancedProgrammableInterruptController.cpp
+++ b/Architecture/amd64/cpu/AdvancedProgrammableInterruptController.cpp
@@ -259,7 +259,8 @@ namespace APIC
         this->lapic->Write(APIC_TIMER, (long)CPU::x64::IRQ0 | (long)APIC_PERIODIC);
         this->lapic->Write(APIC_TDCR, 0x3);
         this->lapic->Write(APIC_TICR, TicksIn10ms / 10);
-        debug("APIC Timer (CPU %d): %d ticks in 10ms", CPU::x64::rdmsr(CPU::x64::MSR_FS_BASE), TicksIn10ms / 10);
+        trace("APIC Timer (CPU %d): %d ticks in 10ms", CPU::x64::rdmsr(CPU::x64::MSR_FS_BASE), TicksIn10ms / 10);
+        KPrint("APIC Timer: %d ticks in 10ms", TicksIn10ms / 10);
     }
 
     Timer::~Timer()
diff --git a/Architecture/amd64/cpu/SymmetricMultiprocessing.cpp b/Architecture/amd64/cpu/SymmetricMultiprocessing.cpp
index 07facd6..51c279c 100644
--- a/Architecture/amd64/cpu/SymmetricMultiprocessing.cpp
+++ b/Architecture/amd64/cpu/SymmetricMultiprocessing.cpp
@@ -89,7 +89,7 @@ namespace SMP
 
         if (Config.Cores > ((ACPI::MADT *)madt)->CPUCores + 1)
             KPrint("More cores requested than available. Using %d cores", ((ACPI::MADT *)madt)->CPUCores + 1);
-        else
+        else if (Config.Cores != 0)
             Cores = Config.Cores;
 
         for (uint16_t i = 0; i < Cores; i++)