diff --git a/ChangeLog b/ChangeLog
index aa9d79915..a63abe9c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2005-03-30  Carl Worth  <cworth@cworth.org>
+
+	A few fixes courtesy of Jason Dorje Short <jdorje@users.sf.net>:
+
+	* configure.in: Disable PS backend if zlib is not found.
+
+	* src/cairo-win32-font.c: (_cairo_win32_font_glyph_path): Fix
+	mistyped parameter.
+	
+	* src/cairo-win32-surface.c: (_cairo_win32_surface_finish): Fix
+	missing return value.
+
 2005-03-30  T Rowley  <tim.rowley@gmail.com>
 
 	* src/cairo-gstate.c (_cairo_gstate_stroke_extents): call
diff --git a/configure.in b/configure.in
index 795c3f760..8acb62ae5 100644
--- a/configure.in
+++ b/configure.in
@@ -172,6 +172,12 @@ AC_ARG_ENABLE(ps,
   [  --disable-ps            Disable cairo's PostScript backend],
   [use_ps=$enableval], [use_ps=yes])
 
+# The postscript module requires zlib.
+AC_CHECK_LIB(z, compress,
+             [AC_CHECK_HEADER(zlib.h, [],
+	         [use_ps="no (requires zlib "http://www.gzip.org/zlib/)"])],
+	     [use_ps="no (requires zlib "http://www.gzip.org/zlib/)"])
+
 if test "x$use_ps" != "xyes"; then
   PS_SURFACE_FEATURE=CAIRO_HAS_NO_PS_SURFACE
   AM_CONDITIONAL(CAIRO_HAS_PS_SURFACE, false)
diff --git a/src/cairo-win32-font.c b/src/cairo-win32-font.c
index c0109ce34..2f43623de 100644
--- a/src/cairo-win32-font.c
+++ b/src/cairo-win32-font.c
@@ -1104,7 +1104,7 @@ static cairo_status_t
 _cairo_win32_font_glyph_path (void			*abstract_font,
 			      cairo_glyph_t		*glyphs, 
 			      int			num_glyphs,
-			      cairo_path_t		*path)
+			      cairo_path_fixed_t	*path)
 {
     return CAIRO_STATUS_SUCCESS;
 }
diff --git a/src/cairo-win32-surface.c b/src/cairo-win32-surface.c
index 447988f80..ca5c0205b 100644
--- a/src/cairo-win32-surface.c
+++ b/src/cairo-win32-surface.c
@@ -324,7 +324,7 @@ _cairo_win32_surface_create_dib (cairo_format_t format,
 					       width, height);
 }
 
-static void
+static cairo_status_t
 _cairo_win32_surface_finish (void *abstract_surface)
 {
     cairo_win32_surface_t *surface = abstract_surface;
@@ -341,6 +341,8 @@ _cairo_win32_surface_finish (void *abstract_surface)
   	DeleteObject (surface->bitmap);
         DeleteDC (surface->dc);
     }
+
+    return CAIRO_STATUS_SUCCESS;
 }
 
 static double