diff --git a/SConstruct b/SConstruct
index 16f2de416..3f12a628b 100644
--- a/SConstruct
+++ b/SConstruct
@@ -32,7 +32,7 @@ opts.Add('PREFIX', 'The install path "prefix"', '/usr/local')
 opts.Add(PathOption('BOOST_INCLUDES', 'Search path for boost include files', '/usr/include'))
 opts.Add(PathOption('BOOST_LIBS', 'Search path for boost library files', '/usr/' + LIBDIR_SCHEMA))
 opts.Add('BOOST_TOOLKIT','Specify boost toolkit e.g. gcc41.','',False)
-opts.Add(PathOption('FREETYPE_CONFIG', 'The path to the freetype-config executable.', '/usr/bin/freetype-config'))
+opts.Add(('FREETYPE_CONFIG', 'The path to the freetype-config executable.', 'freetype-config'))
 opts.Add(PathOption('FRIBIDI_INCLUDES', 'Search path for fribidi include files', '/usr/include'))
 opts.Add(PathOption('FRIBIDI_LIBS','Search path for fribidi include files','/usr/' + LIBDIR_SCHEMA))
 opts.Add(PathOption('PNG_INCLUDES', 'Search path for libpng include files', '/usr/include'))
@@ -228,3 +228,4 @@ else:
 # Install some free default fonts
 
 SConscript('fonts/SConscript')
+
diff --git a/bindings/python/SConscript b/bindings/python/SConscript
index a2b8b5b13..53446d7bf 100644
--- a/bindings/python/SConscript
+++ b/bindings/python/SConscript
@@ -37,11 +37,15 @@ if env['PLATFORM'] == 'Darwin':
         libraries.append('boost_regex%s-mt' % env['BOOST_APPEND'])
     else :
         libraries.append('boost_regex%s' % env['BOOST_APPEND'])
+    
+    if env['THREADING'] == 'multi':
+        libraries.append('boost_thread%s-mt' % env['BOOST_APPEND'])
+
     linkflags = '-F/ -framework Python'
 
 headers = [env['PYTHON_PREFIX'] + '/include/python' + env['PYTHON_VERSION']] + env['CPPPATH']
 
-_mapnik = env.SharedLibrary('_mapnik', glob.glob('*.cpp'), LIBS=libraries, SHLIBPREFIX='', SHLIBSUFFIX='.so', CPPPATH=headers,LINKFLAGS=linkflags)
+_mapnik = env.LoadableModule('_mapnik', glob.glob('*.cpp'), LIBS=libraries, LDMODULEPREFIX='', LDMODULESUFFIX='.so', CPPPATH=headers,LINKFLAGS=linkflags)
 
 paths = """
 mapniklibpath = '%s'
diff --git a/demo/c++/rundemo.cpp b/demo/c++/rundemo.cpp
index b08c19ae9..c068056f4 100644
--- a/demo/c++/rundemo.cpp
+++ b/demo/c++/rundemo.cpp
@@ -45,7 +45,7 @@ int main ( int argc , char** argv)
     freetype_engine::instance()->register_font("/opt/mapnik/lib/mapnik/fonts/DejaVuSans.ttf");
     
     Map m(800,600);
-    m.setBackground(color_factory::from_string("white"));
+    m.set_background(color_factory::from_string("white"));
     
     // create styles
 
diff --git a/plugins/input/postgis/SConscript b/plugins/input/postgis/SConscript
index 827959e20..1d54a47ca 100644
--- a/plugins/input/postgis/SConscript
+++ b/plugins/input/postgis/SConscript
@@ -36,6 +36,8 @@ libraries = ['pq']
 if env['PLATFORM'] == 'Darwin':
     libraries.append('mapnik')
     libraries.append('iconv')
+    if env['THREADING'] == 'multi':
+        libraries.append('boost_thread%s-mt' % env['BOOST_APPEND'])
 
 postgis_inputdriver = env.SharedLibrary('postgis', source=postgis_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries)