Index: src/mm/frame.c
===================================================================
--- src/mm/frame.c	(revision 6ba143dce31ac1490fdc2b36456012f4baadf10c)
+++ src/mm/frame.c	(revision dcbc8be75e5824d4f8c94163799daa1370fbaae0)
@@ -43,9 +43,9 @@
 #include <synch/spinlock.h>
 
-__u32 frames;
-__u32 frames_free;
+count_t frames = 0;
+count_t frames_free;
 
 __u8 *frame_bitmap;
-__u32 frame_bitmap_octets;
+count_t frame_bitmap_octets;
 
 /*
@@ -54,6 +54,6 @@
  */
 __u8 *frame_kernel_bitmap;
-__u32 kernel_frames;
-__u32 kernel_frames_free;
+count_t kernel_frames;
+count_t kernel_frames_free;
 
 static spinlock_t framelock;
@@ -69,5 +69,4 @@
                 frames = config.memory_size / FRAME_SIZE;
                 frame_bitmap_octets = frames / 8 + (frames % 8 > 0);
-
                 frame_bitmap = (__u8 *) malloc(frame_bitmap_octets);
                 if (!frame_bitmap)
@@ -111,5 +110,5 @@
 	pri_t pri;
 	__u8 **frame_bitmap_ptr = &frame_bitmap;
-	__u32 *frames_ptr = &frames, *frames_free_ptr = &frames_free;
+	count_t *frames_ptr = &frames, *frames_free_ptr = &frames_free;
 	
 	if (flags & FRAME_KA) {
@@ -166,5 +165,5 @@
 	pri_t pri;
 	__u32 frame;
-	__u32 *frames_free_ptr = &frames_free, *frames_ptr = &frames;
+	count_t *frames_free_ptr = &frames_free, *frames_ptr = &frames;
 	__u8 **frame_bitmap_ptr = &frame_bitmap;
 
@@ -196,7 +195,7 @@
 			}	
 		}
-		else panic("frame_free: frame already free\n");
-	}
-	else panic("frame_free: frame number too big\n");
+		else panic("frame already free\n");
+	}
+	else panic("frame number too big\n");
 	
 	spinlock_unlock(&framelock);
@@ -212,5 +211,5 @@
 	pri_t pri;
 	__u32 frame;
-	__u32 *frames_ptr = &frames, *frames_free_ptr = &frames_free;
+	count_t *frames_ptr = &frames, *frames_free_ptr = &frames_free;
 	__u8 **frame_bitmap_ptr = &frame_bitmap;
 	
Index: src/mm/heap.c
===================================================================
--- src/mm/heap.c	(revision 6ba143dce31ac1490fdc2b36456012f4baadf10c)
+++ src/mm/heap.c	(revision dcbc8be75e5824d4f8c94163799daa1370fbaae0)
@@ -43,5 +43,5 @@
 static spinlock_t heaplock;
 
-void heap_init(__address heap, __u32 size)
+void heap_init(__address heap, size_t size)
 {
 	spinlock_initialize(&heaplock);
@@ -63,5 +63,5 @@
 
 	if (size == 0)
-		panic("malloc: zero-size allocation request");
+		panic("zero-size allocation request");
 		
 	x = chunk0;