diff --git a/c/xlib/pixmap.c b/c/xlib/pixmap.c
index 86817ae..1f6fa23 100644
--- a/c/xlib/pixmap.c
+++ b/c/xlib/pixmap.c
@@ -51,12 +51,13 @@ s48_value scx_Read_Bitmap_File (s48_value Xdisplay, s48_value Xdrawable,
   s48_value ret = S48_FALSE;
   S48_DECLARE_GC_PROTECT(1);
   // Not used: Disable_Interrupts;
-  res = XReadBitmapFile (SCX_EXTRACT_DISPLAY(Xdisplay), SCX_EXTRACT_DRAWABLE(Xdrawable),
+  res = XReadBitmapFile (SCX_EXTRACT_DISPLAY(Xdisplay), 
+			 SCX_EXTRACT_DRAWABLE(Xdrawable),
 			 s48_extract_string(file), &width, &height, &bitmap,
 			 &xhot, &yhot);
   // Not used: Enable_Interrupts;
   if (res != BitmapSuccess){
-    return Bits_To_Symbols ((unsigned long)ret, Bitmapstatus_Syms);
+    return Bit_To_Symbol ((unsigned long)ret, Bitmapstatus_Syms);
   }
   S48_GC_PROTECT_1 (ret);
   ret = s48_cons (s48_enter_integer(yhot), S48_NULL);
@@ -83,7 +84,7 @@ s48_value scx_Write_Bitmap_File (s48_value Xdisplay, s48_value file,
 			  (int)s48_extract_integer(x), 
 			  (int)s48_extract_integer(y));
   //  Enable_Interrupts;
-  return Bits_To_Symbols ((unsigned long)ret, Bitmapstatus_Syms);
+  return Bit_To_Symbol ((unsigned long)ret, Bitmapstatus_Syms);
 }
 
 
diff --git a/c/xlib/text.c b/c/xlib/text.c
index 3221e15..1ef05d8 100644
--- a/c/xlib/text.c
+++ b/c/xlib/text.c
@@ -141,7 +141,7 @@ s48_value scx_Draw_Poly_Text (s48_value Xdisplay, s48_value Xdrawable,
 	k = S48_VECTOR_LENGTH(temp_vec);
 	item[set].nchars = k;
 	if (twobyte) {
-	  XChar2b* s2 = malloc(sizeof(XChar2b)*k);
+	  XChar2b* s2 = (XChar2b*)malloc(sizeof(XChar2b)*k);
 	  for (j = 0; j < k; j++){
 	    tmp = (int)s48_extract_integer(S48_VECTOR_REF(temp_vec, j));
 	    s2[j].byte1 = (tmp >> 8) & 0xff;
@@ -149,7 +149,7 @@ s48_value scx_Draw_Poly_Text (s48_value Xdisplay, s48_value Xdrawable,
 	  }
 	  (XTextItem16*)item[set].chars = s2;
 	} else {
-	  char* s = malloc(sizeof(char)*k);
+	  char* s = (char*)malloc(sizeof(char)*k);
 	  for (j = 0; j < k; j++) {
 	    s[j] = (int)s48_extract_integer(S48_VECTOR_REF(temp_vec, j));
 	  }