diff --git a/doc/gtk-doc.make b/doc/gtk-doc.make
index 9ccd0b04..e7916563 100644
--- a/doc/gtk-doc.make
+++ b/doc/gtk-doc.make
@@ -25,7 +25,6 @@ TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
 
 SETUP_FILES = \
 	$(content_files)		\
-	$(expand_content_files)		\
 	$(DOC_MAIN_SGML_FILE)		\
 	$(DOC_MODULE)-sections.txt	\
 	$(DOC_MODULE)-overrides.txt
@@ -87,7 +86,7 @@ GTK_DOC_V_SETUP_0=@echo "  DOC   Preparing build";
 
 setup-build.stamp:
 	-$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
-	    files=`echo $(SETUP_FILES) $(DOC_MODULE).types`; \
+	    files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
 	    if test "x$$files" != "x" ; then \
 	        for file in $$files ; do \
 	            destdir=`dirname $(abs_builddir)/$$file`; \
@@ -119,7 +118,7 @@ scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB)
 	$(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
 	    scanobj_options=""; \
 	    gtkdoc-scangobj 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
-	    if test "$$?" = "0"; then \
+	    if test "$(?)" = "0"; then \
 	        if test "x$(V)" = "x1"; then \
 	            scanobj_options="--verbose"; \
 	        fi; \
@@ -163,17 +162,17 @@ GTK_DOC_V_XREF=$(GTK_DOC_V_XREF_$(V))
 GTK_DOC_V_XREF_=$(GTK_DOC_V_XREF_$(AM_DEFAULT_VERBOSITY))
 GTK_DOC_V_XREF_0=@echo "  DOC   Fixing cross-references";
 
-html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files)
+html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
 	$(GTK_DOC_V_HTML)rm -rf html && mkdir html && \
 	mkhtml_options=""; \
 	gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
-	if test "$$?" = "0"; then \
+	if test "$(?)" = "0"; then \
 	  if test "x$(V)" = "x1"; then \
 	    mkhtml_options="$$mkhtml_options --verbose"; \
 	  fi; \
 	fi; \
 	gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-path"; \
-	if test "$$?" = "0"; then \
+	if test "$(?)" = "0"; then \
 	  mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \
 	fi; \
 	cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
@@ -195,11 +194,11 @@ GTK_DOC_V_PDF=$(GTK_DOC_V_PDF_$(V))
 GTK_DOC_V_PDF_=$(GTK_DOC_V_PDF_$(AM_DEFAULT_VERBOSITY))
 GTK_DOC_V_PDF_0=@echo "  DOC   Building PDF";
 
-pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files)
+pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
 	$(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \
 	mkpdf_options=""; \
 	gtkdoc-mkpdf 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
-	if test "$$?" = "0"; then \
+	if test "$(?)" = "0"; then \
 	  if test "x$(V)" = "x1"; then \
 	    mkpdf_options="$$mkpdf_options --verbose"; \
 	  fi; \
@@ -224,15 +223,12 @@ clean-local:
 	@if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-types" ; then \
 	  rm -f $(DOC_MODULE).types; \
 	fi
-	@if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-sections" ; then \
-	  rm -f $(DOC_MODULE)-sections.txt; \
-	fi
 
 distclean-local:
 	@rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \
 	    $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
 	@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
-	    rm -f $(SETUP_FILES) $(DOC_MODULE).types; \
+	    rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \
 	fi
 
 maintainer-clean-local:
diff --git a/libvips/conversion/tilecache.c b/libvips/conversion/tilecache.c
index 1e046957..f0f803bb 100644
--- a/libvips/conversion/tilecache.c
+++ b/libvips/conversion/tilecache.c
@@ -938,21 +938,21 @@ vips_line_cache_build( VipsObject *object )
 		block_cache->max_tiles = 2 * vips_concurrency_get();
 	else { 
 		/* Enough lines for two complete buffers would be exactly 
-		 * right. Make it 3 to give us some slop room. 
+		 * right. Make it 4 to give us some slop room. 
 		 *
 		 * This can go up with request size, see vips_line_cache_gen().
 		 */
 		int tile_width;
 		int tile_height;
-		int nlines;
+		int n_lines;
 
 		vips_get_tile_size( block_cache->in, 
-			&tile_width, &tile_height, &nlines );
+			&tile_width, &tile_height, &n_lines );
 		block_cache->max_tiles = 4 * 
-			(1 + nlines / block_cache->tile_height);
+			(1 + n_lines / block_cache->tile_height);
 
-		VIPS_DEBUG_MSG( "vips_line_cache_build: nlines = %d\n", 
-			nlines );
+		VIPS_DEBUG_MSG( "vips_line_cache_build: n_lines = %d\n", 
+			n_lines );
 	}
 
 	VIPS_DEBUG_MSG( "vips_line_cache_build: "
diff --git a/libvips/resample/resize.c b/libvips/resample/resize.c
index 56df27e6..b049b3c1 100644
--- a/libvips/resample/resize.c
+++ b/libvips/resample/resize.c
@@ -161,18 +161,17 @@ vips_resize_build( VipsObject *object )
 	 * perhaps 0.5 or down as low as 0.3 depending on the interpolator. So
 	 * the number of scanlines we need to keep for the worst case is
 	 * 2 * @tile_height / @residual, plus a little extra.
-	 *
 	 */
 	if( int_shrink > 1 ) { 
 		int tile_width;
 		int tile_height;
-		int nlines;
+		int n_lines;
 
 		int need_lines;
 
 		vips_get_tile_size( in, 
-			&tile_width, &tile_height, &nlines );
-		need_lines = 2.5 * tile_height / residual;
+			&tile_width, &tile_height, &n_lines );
+		need_lines = 1.2 * n_lines / residual;
 		if( vips_tilecache( in, &t[6], 
 			"tile_width", in->Xsize,
 			"tile_height", 10,