diff --git a/ChangeLog b/ChangeLog
index 3e1ca88d7..33b1a7d4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-28  Thomas Thurman  <tthurman@gnome.org>
+
+        * src/core/display.c, src/compositor/compositor-xrender.c: add checks
+          for HAVE_SHAPE where appropriate.
+        * src/core/xprops.c: fix type error which was causing warnings.
+
 2008-06-28  Thomas Thurman  <tthurman@gnome.org>
 
         Some refactoring, simplifying, and commenting of the non-composited
diff --git a/src/compositor/compositor-xrender.c b/src/compositor/compositor-xrender.c
index b128daf70..a85448db7 100644
--- a/src/compositor/compositor-xrender.c
+++ b/src/compositor/compositor-xrender.c
@@ -2802,8 +2802,10 @@ xrender_process_event (MetaCompositor *compositor,
     default:
       if (event->type == meta_display_get_damage_event_base (xrc->display) + XDamageNotify) 
         process_damage (xrc, (XDamageNotifyEvent *) event);
+#ifdef HAVE_SHAPE
       else if (event->type == meta_display_get_shape_event_base (xrc->display) + ShapeNotify) 
         process_shape (xrc, (XShapeEvent *) event);
+#endif /* HAVE_SHAPE */
       else 
         {
           meta_error_trap_pop (xrc->display, FALSE);
diff --git a/src/core/display.c b/src/core/display.c
index 5b9d76b32..613230ff7 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -5166,9 +5166,11 @@ meta_display_get_damage_event_base (MetaDisplay *display)
 #endif
 
 #ifdef HAVE_COMPOSITE_EXTENSIONS
+#ifdef HAVE_SHAPE
 int
 meta_display_get_shape_event_base (MetaDisplay *display)
 {
   return display->shape_event_base;
 }
 #endif
+#endif
diff --git a/src/core/xprops.c b/src/core/xprops.c
index a3d7fcc05..d2edc55cc 100644
--- a/src/core/xprops.c
+++ b/src/core/xprops.c
@@ -1051,7 +1051,7 @@ meta_prop_get_values (MetaDisplay   *display,
                                       &results.type, &results.format,
                                       &results.n_items,
                                       &results.bytes_after,
-                                      (gchar **)&results.prop) != Success ||
+                                      (unsigned char **)(&results.prop)) != Success ||
           results.type == None)
         {
           values[i].type = META_PROP_VALUE_INVALID;