diff --git a/plugins/input/csv/build.py b/plugins/input/csv/build.py
index 7eb22ccb3..08b7666a2 100644
--- a/plugins/input/csv/build.py
+++ b/plugins/input/csv/build.py
@@ -27,6 +27,9 @@ TARGET = plugin_env.SharedLibrary(
               LINKFLAGS=env.get('CUSTOM_LDFLAGS')
               )
 
+# if the plugin links to libmapnik2 ensure it is built first
+Depends(input_plugin, env.subst('../../../src/%s' % env['MAPNIK_LIB_NAME']))
+
 if 'uninstall' not in COMMAND_LINE_TARGETS:
     env.Install(install_dest, TARGET)
     env.Alias('install', install_dest)
diff --git a/plugins/input/kismet/build.py b/plugins/input/kismet/build.py
index 7a91069ab..111a4beeb 100644
--- a/plugins/input/kismet/build.py
+++ b/plugins/input/kismet/build.py
@@ -36,7 +36,8 @@ libraries = []
 # Link Library to Dependencies
 libraries.append('mapnik2')
 libraries.append(env['ICU_LIB_NAME'])
-libraries.append('boost_thread%s' % env['BOOST_APPEND'])
+if env['THREADING'] == 'multi':
+    libraries.append('boost_thread%s' % env['BOOST_APPEND'])
 
 input_plugin = plugin_env.SharedLibrary('../kismet', source=kismet_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries, LINKFLAGS=env['CUSTOM_LDFLAGS'])