diff --git a/hypervisor/arch/x86/cpu.c b/hypervisor/arch/x86/cpu.c
index feb427262..e78510876 100644
--- a/hypervisor/arch/x86/cpu.c
+++ b/hypervisor/arch/x86/cpu.c
@@ -22,7 +22,6 @@
 #include <vmx.h>
 #include <msr.h>
 #include <ptdev.h>
-#include <ld_sym.h>
 #include <logmsg.h>
 #include <cat.h>
 #include <vboot.h>
@@ -108,16 +107,6 @@ void init_pcpu_pre(bool is_bsp)
 		pcpu_id = BOOT_CPU_ID;
 		start_tsc = rdtsc();
 
-		/* Clear BSS */
-		(void)memset(&ld_bss_start, 0U, (size_t)(&ld_bss_end - &ld_bss_start));
-
-		(void)parse_hv_cmdline();
-		/*
-		 * Enable UART as early as possible.
-		 * Then we could use printf for debugging on early boot stage.
-		 */
-		uart16550_init(true);
-
 		/* Get CPU capabilities thru CPUID, including the physical address bit
 		 * limit which is required for initializing paging.
 		 */
diff --git a/hypervisor/arch/x86/init.c b/hypervisor/arch/x86/init.c
index 5b1242df6..259e68050 100644
--- a/hypervisor/arch/x86/init.c
+++ b/hypervisor/arch/x86/init.c
@@ -15,6 +15,9 @@
 #include <vm.h>
 #include <logmsg.h>
 #include <seed.h>
+#include <uart16550.h>
+#include <ld_sym.h>
+#include <vboot.h>
 
 /* Push sp magic to top of stack for call trace */
 #define SWITCH_TO(rsp, to)                                              \
@@ -29,6 +32,12 @@
 /*TODO: move into debug module */
 static void init_debug_pre(void)
 {
+	/*
+	 * Enable UART as early as possible.
+	 * Then we could use printf for debugging on early boot stage.
+	 */
+	uart16550_init(true);
+
 	/* Initialize console */
 	console_init();
 
@@ -58,8 +67,6 @@ static void init_guest_mode(uint16_t pcpu_id)
 
 static void init_primary_pcpu_post(void)
 {
-	init_debug_pre();
-
 	init_seed();
 
 	init_pcpu_post(BOOT_CPU_ID);
@@ -78,6 +85,13 @@ void init_primary_pcpu(void)
 {
 	uint64_t rsp;
 
+	/* Clear BSS */
+	(void)memset(&ld_bss_start, 0U, (size_t)(&ld_bss_end - &ld_bss_start));
+
+	(void)parse_hv_cmdline();
+
+	init_debug_pre();
+
 	init_pcpu_pre(true);
 
 	/* Switch to run-time stack */
diff --git a/hypervisor/arch/x86/timer.c b/hypervisor/arch/x86/timer.c
index 9944664d9..a7a9b5c4b 100644
--- a/hypervisor/arch/x86/timer.c
+++ b/hypervisor/arch/x86/timer.c
@@ -318,7 +318,13 @@ uint64_t us_to_ticks(uint32_t us)
 
 uint64_t ticks_to_us(uint64_t ticks)
 {
-	return (ticks * 1000UL) / (uint64_t)tsc_khz;
+	uint64_t us = 0UL;
+
+	if (tsc_khz != 0U ) {
+		us = (ticks * 1000UL) / (uint64_t)tsc_khz;
+	}
+
+	return us;
 }
 
 uint64_t ticks_to_ms(uint64_t ticks)