diff --git a/headers/os/kernel/OS.h b/headers/os/kernel/OS.h
index c3fe2b0261..633e4541b5 100644
--- a/headers/os/kernel/OS.h
+++ b/headers/os/kernel/OS.h
@@ -645,7 +645,7 @@ typedef enum cpu_types {
 
 #define B_CPU_x86_VENDOR_MASK	0xff00
 
-#if defined(__INTEL__) || defined(__x86_64)
+#if defined(__INTEL__) || defined(__x86_64__)
 typedef union {
 	struct {
 		uint32	max_eax;
diff --git a/src/system/kernel/arch/x86/paging/x86_physical_page_mapper_mapped.cpp b/src/system/kernel/arch/x86/paging/x86_physical_page_mapper_mapped.cpp
index d74fb7cd7a..babdbb87c6 100644
--- a/src/system/kernel/arch/x86/paging/x86_physical_page_mapper_mapped.cpp
+++ b/src/system/kernel/arch/x86/paging/x86_physical_page_mapper_mapped.cpp
@@ -224,9 +224,8 @@ MappedPhysicalPageMapper::MemcpyToPhysical(phys_addr_t _to, const void* from,
 
 	if (user)
 		return user_memcpy(to, from, length);
-	else
-		memcpy(to, from, length);
 
+	memcpy(to, from, length);
 	return B_OK;
 }