diff --git a/src/autoconf/configure.ac b/src/autoconf/configure.ac
index c47b34f..4d7aa10 100644
--- a/src/autoconf/configure.ac
+++ b/src/autoconf/configure.ac
@@ -1261,7 +1261,6 @@ echo "--- libpsyc"
 lp_cv_has_psyc_lib="no"
 AC_CHECK_LIB(psyc,main, lp_cv_has_psyc_lib="yes")
 
-# dont know why this fails on bsd, had to patch machine.h manually... FIXME
 if test $lp_cv_has_psyc_lib = yes; then
     LIBS="-lpsyc"
     AC_CACHE_CHECK(for libpsyc functionality,lp_cv_has_psyc,
@@ -1463,10 +1462,8 @@ int main(void)
         fi
 
         if test "x$tmp" = "x"; then
-#           echo "iconv library not found."
-#           lp_cv_has_iconv="no"
-	    # FIXME: cheating here
-            PKGLIBS="$PKGLIBS -L/usr/local/lib -liconv"
+            echo "iconv library not found."
+            lp_cv_has_iconv="no"
         else
             PKGLIBS="$PKGLIBS $tmp"
         fi
diff --git a/src/configure b/src/configure
index 9be6c29..a1f403f 100755
--- a/src/configure
+++ b/src/configure
@@ -5,5 +5,9 @@ if test ! -f "configure-do" ; then
 	(cd autoconf;make)
 fi
 
+# some systems still expect you to manually add /usr/local.. c'mon!
+export CPPFLAGS="-I/usr/local/include"
+export LDFLAGS="-L/usr/local/lib"
+
 # then run it with psyced defaults
 settings/psyced $*
diff --git a/src/pkg-tls.c b/src/pkg-tls.c
index 8ff1213..16e35bc 100644
--- a/src/pkg-tls.c
+++ b/src/pkg-tls.c
@@ -540,8 +540,7 @@ tls_global_init (void)
     SSL_CTX_set_options(context, SSL_OP_NO_SSLv2);
 
     if (SSL_CTX_set_cipher_list(context, "HIGH:!DSS:!aNULL@STRENGTH") != 1) {
-        debug_message("SSL_CTX_set_cipher_list failed."
-                    , time_stamp());
+        debug_message("%s SSL_CTX_set_cipher_list failed.", time_stamp());
         goto ssl_init_err;
     }
 
@@ -991,27 +990,6 @@ v_tls_init_connection (svalue_t *sp, int num_arg)
     if (!tls_available)
         errorf("tls_init_connection(): TLS layer hasn't been initialized.\n");
 
-#if 1
-    if (num_arg > 0)
-    {
-        obj = argp->u.ob;
-        put_number(argp, 0); /* remove obj reference from the stack */
-    }
-    else
-    {
-        obj = ref_object(current_object, "tls_init_connection");
-    }
-
-    if (!O_SET_INTERACTIVE(ip, obj))
-    {
-        free_object(obj, "tls_init_connection");
-        errorf("Bad arg 1 to tls_init_connection(): "
-              "object not interactive.\n");
-    }
-
-    free_object(obj, "tls_init_connection");
-      /* ip has another reference to obj, so this is safe to do */
-#else
     if (num_arg > 0)
     {
         obj = argp->u.ob;
@@ -1029,7 +1007,7 @@ v_tls_init_connection (svalue_t *sp, int num_arg)
         errorf("Bad arg 1 to tls_init_connection(): "
               "object not interactive.\n");
     }
-#endif
+
     if (ip->tls_status != TLS_INACTIVE)
         errorf("tls_init_connection(): Interactive already has a secure "
               "connection.\n");
diff --git a/src/version.sh b/src/version.sh
index 5a12471..532dcec 100644
--- a/src/version.sh
+++ b/src/version.sh
@@ -17,7 +17,7 @@ version_longtype="stable"
 # A timestamp, to be used by bumpversion and other scripts.
 # It can be used, for example, to 'touch' this file on every build, thus
 # forcing revision control systems to add it on every checkin automatically.
-version_stamp="Wed Aug 10 17:20:27 CEST 2016"
+version_stamp="Wed Aug 10 17:23:36 CEST 2016"
 
 # Okay, LDMUD is using 3.x.x so to avoid conflicts let's just use 4.x.x
 version_major=4