diff --git a/ChangeLog b/ChangeLog
index 7d9fa67240..00b1bbac78 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2003-08-13  Manish Singh  <yosh@gimp.org>
+
+	* pygimp/Makefile.am: slight include file ordering tweak
+
+	* plug-ins/pygimp/plug-ins/colorhtml.py: add a sanity check
+
+	* plug-ins/pygimp/plug-ins/sphere.py
+	* plug-ins/pygimp/plug-ins/whirlpinch.py: minor cleanups for
+	Python 2.3
+
+	* plug-ins/webbrowser/web-browser.scm: change script to reflect
+	new pdb name of the web-browser.
+
 2003-08-13  Gil "Dolfin" Osher  <dolfin@rpg.org.il>
 
 	* configure.in: Added "he" (Hebrew) to ALL_LINGUAS.
diff --git a/plug-ins/pygimp/Makefile.am b/plug-ins/pygimp/Makefile.am
index 79dc6666bc..d50f752b84 100644
--- a/plug-ins/pygimp/Makefile.am
+++ b/plug-ins/pygimp/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = doc plug-ins
 
-INCLUDES = $(PYTHON_INCLUDES) $(GLIB_CFLAGS) -I$(top_srcdir)
+INCLUDES = -I$(top_srcdir) $(PYTHON_INCLUDES) $(GLIB_CFLAGS)
 
 pygimpdir = $(gimpplugindir)/python
 
diff --git a/plug-ins/pygimp/plug-ins/colorhtml.py b/plug-ins/pygimp/plug-ins/colorhtml.py
index 7547a0e74c..28e0059635 100755
--- a/plug-ins/pygimp/plug-ins/colorhtml.py
+++ b/plug-ins/pygimp/plug-ins/colorhtml.py
@@ -42,6 +42,9 @@ def python_colorhtml(img, drawable, filename, raw_filename,
     height = drawable.height
     bpp = drawable.bpp
 
+    if not drawable.is_rgb or drawable.has_alpha:
+        return
+
     gimp.tile_cache_ntiles(width / gimp.tile_width() + 1)
 
     html = file(filename, 'w')
diff --git a/plug-ins/pygimp/plug-ins/colorxhtml.py b/plug-ins/pygimp/plug-ins/colorxhtml.py
index 7547a0e74c..28e0059635 100755
--- a/plug-ins/pygimp/plug-ins/colorxhtml.py
+++ b/plug-ins/pygimp/plug-ins/colorxhtml.py
@@ -42,6 +42,9 @@ def python_colorhtml(img, drawable, filename, raw_filename,
     height = drawable.height
     bpp = drawable.bpp
 
+    if not drawable.is_rgb or drawable.has_alpha:
+        return
+
     gimp.tile_cache_ntiles(width / gimp.tile_width() + 1)
 
     html = file(filename, 'w')
diff --git a/plug-ins/pygimp/plug-ins/sphere.py b/plug-ins/pygimp/plug-ins/sphere.py
index fba1637537..0e572c249f 100755
--- a/plug-ins/pygimp/plug-ins/sphere.py
+++ b/plug-ins/pygimp/plug-ins/sphere.py
@@ -21,8 +21,8 @@ import math
 from gimpfu import *
 
 def python_sphere(radius, light, shadow, bg_colour, sphere_colour):
-    width = radius * 3.75
-    height = radius * 2.5;
+    width = int(radius * 3.75)
+    height = int(radius * 2.5)
     img = gimp.Image(width, height, RGB)
     drawable = gimp.Layer(img, "Sphere Layer", width, height,
 			  RGB_IMAGE, 100, NORMAL_MODE)
diff --git a/plug-ins/pygimp/plug-ins/whirlpinch.py b/plug-ins/pygimp/plug-ins/whirlpinch.py
index 46a9ffd09b..751c7fb1a0 100755
--- a/plug-ins/pygimp/plug-ins/whirlpinch.py
+++ b/plug-ins/pygimp/plug-ins/whirlpinch.py
@@ -193,7 +193,7 @@ def bilinear(x, y, values):
 	y = y % 1.0
 	m0 = values[0] + x * (values[1] - values[0])
 	m1 = values[2] + x * (values[3] - values[2])
-	return chr(m0 + y * (m1 - m0))
+	return chr(int(m0 + y * (m1 - m0)))
 
 
 register(
diff --git a/plug-ins/webbrowser/web-browser.scm b/plug-ins/webbrowser/web-browser.scm
index f156116edd..6d0d1f0cf4 100644
--- a/plug-ins/webbrowser/web-browser.scm
+++ b/plug-ins/webbrowser/web-browser.scm
@@ -23,7 +23,7 @@
 (set! web-browser-new-window 0)
 
 (define (script-fu-bookmark url)
-  (extension-web-browser 1 url web-browser-new-window))
+  (plug-in-web-browser 1 url web-browser-new-window))
 
 (define (bookmark-register proc menu help)
   (script-fu-register proc menu help