Index: kernel/arch/amd64/src/debugger.c
===================================================================
--- kernel/arch/amd64/src/debugger.c	(revision 2b17f47a12be0ade0b8cfd4a26a738c33c7d2336)
+++ kernel/arch/amd64/src/debugger.c	(revision eda8b8b798466f2e78a0f083d263fcbaf0bbd615)
@@ -107,23 +107,29 @@
 	unsigned int i;
 	char *symbol;
-	
-	if (sizeof(void *) == 4) {
-		printf("#  Count Address    In symbol\n");
-		printf("-- ----- ---------- ---------\n");
-	} else {
-		printf("#  Count Address            In symbol\n");
-		printf("-- ----- ------------------ ---------\n");
-	}
+
+#ifdef __32_BITS__	
+	printf("#  Count Address    In symbol\n");
+	printf("-- ----- ---------- ---------\n");
+#endif
+
+#ifdef __64_BITS__
+	printf("#  Count Address            In symbol\n");
+	printf("-- ----- ------------------ ---------\n");
+#endif
 	
 	for (i = 0; i < BKPOINTS_MAX; i++)
 		if (breakpoints[i].address) {
 			symbol = get_symtab_entry(breakpoints[i].address);
-			
-			if (sizeof(void *) == 4)
-				printf("%-2u %-5d %#10zx %s\n", i, breakpoints[i].counter,
-					breakpoints[i].address, symbol);
-			else
-				printf("%-2u %-5d %#18zx %s\n", i, breakpoints[i].counter,
-					breakpoints[i].address, symbol);
+
+#ifdef __32_BITS__
+			printf("%-2u %-5d %#10zx %s\n", i, breakpoints[i].counter,
+				breakpoints[i].address, symbol);
+#endif
+
+#ifdef __64_BITS__
+			printf("%-2u %-5d %#18zx %s\n", i, breakpoints[i].counter,
+				breakpoints[i].address, symbol);
+#endif
+
 		}
 	return 1;
@@ -163,13 +169,17 @@
 			;
 		} else {
-			if (sizeof(int) == 4)
-				dr7 |= ((unative_t) 0x3) << (18 + 4*curidx);
-			else /* 8 */
-				dr7 |= ((unative_t) 0x2) << (18 + 4*curidx);
+		
+#ifdef __32_BITS__
+			dr7 |= ((unative_t) 0x3) << (18 + 4 * curidx);
+#endif
+
+#ifdef __64_BITS__
+			dr7 |= ((unative_t) 0x2) << (18 + 4 * curidx);
+#endif
 			
 			if ((flags & BKPOINT_WRITE))
-				dr7 |= ((unative_t) 0x1) << (16 + 4*curidx);
+				dr7 |= ((unative_t) 0x1) << (16 + 4 * curidx);
 			else if ((flags & BKPOINT_READ_WRITE))
-				dr7 |= ((unative_t) 0x3) << (16 + 4*curidx);
+				dr7 |= ((unative_t) 0x3) << (16 + 4 * curidx);
 		}
 
Index: kernel/arch/amd64/src/proc/thread.c
===================================================================
--- kernel/arch/amd64/src/proc/thread.c	(revision 2b17f47a12be0ade0b8cfd4a26a738c33c7d2336)
+++ kernel/arch/amd64/src/proc/thread.c	(revision eda8b8b798466f2e78a0f083d263fcbaf0bbd615)
@@ -47,5 +47,5 @@
 	 */
 	t->arch.syscall_rsp[SYSCALL_KSTACK_RSP] =
-	    (uintptr_t)&t->kstack[PAGE_SIZE - sizeof(uint64_t)];
+	    (uintptr_t) &t->kstack[PAGE_SIZE - sizeof(uint64_t)];
 }