diff --git a/lib/Basics/files.cpp b/lib/Basics/files.cpp
index 4a2662f05c..886db4833e 100644
--- a/lib/Basics/files.cpp
+++ b/lib/Basics/files.cpp
@@ -1161,7 +1161,6 @@ int TRI_VerifyLockFile(char const* filename) {
     LOG_TOPIC(WARN, arangodb::Logger::FIXME) << "found existing lockfile '" << filename << "' of previous process with pid " << pid << ", and that process seems to be still running";
   }
 
-#ifdef TRI_HAVE_SETLK
   struct flock lock;
   
   lock.l_start = 0;
@@ -1196,7 +1195,6 @@ int TRI_VerifyLockFile(char const* filename) {
               << "' failed: " << TRI_last_error()
               << ". a possible reason is that the filesystem does not support file-locking";
   }
-#endif
   
   return TRI_ERROR_ARANGO_DATADIR_LOCKED;
 }
diff --git a/lib/Basics/operating-system.h b/lib/Basics/operating-system.h
index 5df4bf75cf..bd952601ba 100644
--- a/lib/Basics/operating-system.h
+++ b/lib/Basics/operating-system.h
@@ -602,7 +602,6 @@
 #define TRI_HAVE_POSIX_PWD_GRP 1
 #define TRI_HAVE_POSIX_THREADS 1
 #define TRI_HAVE_SC_PHYS_PAGES 1
-#define TRI_HAVE_SETLK 1
 
 #define TRI_HAVE_ANONYMOUS_MMAP 1
 
diff --git a/scripts/disable-cores.sh b/scripts/disable-cores.sh
index 6a06ff6b20..0da0ef5f99 100755
--- a/scripts/disable-cores.sh
+++ b/scripts/disable-cores.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 ulimit -c 0
-$@ || true
+"$@" || true