diff --git a/.gitignore b/.gitignore
index 6c2f8e3..e9b854b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,8 +3,15 @@ build
 terrain.png
 cachedir*
 
+# header files that may be copied over, if missing
+ImPlatform.h
+Imaging.h
+
 # various forms of compiled _composite extensions
 _composite.so
 _composite.pyd
 _composite_d.pyd
 _composite.dylib
+
+# Mac OS X noise
+.DS_Store
diff --git a/setup.py b/setup.py
index 95bba2a..4348e6a 100644
--- a/setup.py
+++ b/setup.py
@@ -32,7 +32,7 @@ if py2exe != None:
 # _composite.c extension
 #
 
-setup_kwargs['ext_modules'].append(Extension('_composite', ['_composite.c']))
+setup_kwargs['ext_modules'].append(Extension('_composite', ['_composite.c'], include_dirs=['.']))
 # tell build_ext to build the extension in-place
 # (NOT in build/)
 setup_kwargs['options']['build_ext'] = {'inplace' : 1}
@@ -48,8 +48,8 @@ class CustomClean(clean):
         # try to remove '_composite.{so,pyd,...}' extension,
         # regardless of the current system's extension name convention
         build_ext = self.get_finalized_command('build_ext')
-        fname = build_ext.get_ext_fullpath('_composite')
-        pretty_fname = os.path.split(fname)[1]
+        pretty_fname = build_ext.get_ext_filename('_composite')
+        fname = pretty_fname
         if os.path.exists(fname):
             try:
                 if not self.dry_run:
diff --git a/textures.py b/textures.py
index fd27107..5631dda 100644
--- a/textures.py
+++ b/textures.py
@@ -402,9 +402,9 @@ def generate_special_texture(blockID, data):
 
         img = Image.new("RGBA", (24,24), (38,92,255,0))
 
-        img.paste(side1, (0,6), side1)
-        img.paste(side2, (12,6), side2)
-        img.paste(top, (0,0), top)
+        composite.alpha_over(img, side1, (0,6), side1)
+        composite.alpha_over(img, side2, (12,6), side2)
+        composite.alpha_over(img, top, (0,0), top)
         return (img.convert("RGB"), img.split()[3])
     
     if blockID == 62: # lit furnace
@@ -504,9 +504,9 @@ def generate_special_texture(blockID, data):
 
         img = Image.new("RGBA", (24,24), (38,92,255,0))
 
-        img.paste(side1, (0,6), side1)
-        img.paste(side2, (12,6), side2)
-        img.paste(top, (0,0), top)
+        composite.alpha_over(img, side1, (0,6), side1)
+        composite.alpha_over(img, side2, (12,6), side2)
+        composite.alpha_over(img, top, (0,0), top)
         return (img.convert("RGB"), img.split()[3])
     
     if blockID == 18: # leaves
@@ -517,9 +517,9 @@ def generate_special_texture(blockID, data):
 
         img = Image.new("RGBA", (24,24), (38,92,255,0))
 
-        img.paste(side1, (0,6), side1)
-        img.paste(side2, (12,6), side2)
-        img.paste(top, (0,0), top)
+        composite.alpha_over(img, side1, (0,6), side1)
+        composite.alpha_over(img, side2, (12,6), side2)
+        composite.alpha_over(img, top, (0,0), top)
         return (img.convert("RGB"), img.split()[3])