diff --git a/lib/BasicsC/messages.h b/lib/BasicsC/messages.h
index 79a6432b59..09e20450db 100644
--- a/lib/BasicsC/messages.h
+++ b/lib/BasicsC/messages.h
@@ -56,7 +56,7 @@ extern "C" {
 #define TRI_BYE_MESSAGE_RU "До свидания!"
 #define TRI_BYE_MESSAGE_SV "Adjö!"
 
-#define TRI_BYE_MESSAGE (\
+#define TRI_BYE_MESSAGE \
   TRI_BYE_MESSAGE_CH " " \
   TRI_BYE_MESSAGE_CZ " " \
   TRI_BYE_MESSAGE_DE " " \
@@ -69,7 +69,7 @@ extern "C" {
   TRI_BYE_MESSAGE_JP " " \
   TRI_BYE_MESSAGE_NL " " \
   TRI_BYE_MESSAGE_RU " " \
-  TRI_BYE_MESSAGE_SV)
+  TRI_BYE_MESSAGE_SV
 
 ////////////////////////////////////////////////////////////////////////////////
 /// @}
diff --git a/lib/Logger/LoggerStream.cpp b/lib/Logger/LoggerStream.cpp
index 3e6644fae8..d40b44f246 100644
--- a/lib/Logger/LoggerStream.cpp
+++ b/lib/Logger/LoggerStream.cpp
@@ -139,7 +139,7 @@ LoggerStream::LoggerStream (LoggerData::Info const& info) :
 /// @brief move or copy constructor
 ////////////////////////////////////////////////////////////////////////////////
 
-#if defined(_MSC_VER)
+#ifdef _MSC_VER
 
 LoggerStream::LoggerStream (LoggerStream&& copy) :
   _stream(copy._stream), _info(copy._info) {
diff --git a/lib/Logger/LoggerStream.h b/lib/Logger/LoggerStream.h
index 2cb928c4f6..6dac741c27 100644
--- a/lib/Logger/LoggerStream.h
+++ b/lib/Logger/LoggerStream.h
@@ -51,7 +51,10 @@ namespace triagens {
 
     class LoggerStream {
       LoggerStream& operator= (LoggerStream const&);
+
+#ifdef _MSC_VER
       LoggerStream (LoggerStream const&);
+#endif
 
 ////////////////////////////////////////////////////////////////////////////////
 /// @}
@@ -84,7 +87,7 @@ namespace triagens {
 /// @brief move or copy constructor
 ////////////////////////////////////////////////////////////////////////////////
 
-#if defined(_MSC_VER)
+#ifdef _MSC_VER
         LoggerStream (LoggerStream&&);
 #else
         LoggerStream (LoggerStream const&);
diff --git a/lib/Makefile.files b/lib/Makefile.files
index d3938eb49f..55e8f70e40 100644
--- a/lib/Makefile.files
+++ b/lib/Makefile.files
@@ -95,7 +95,7 @@ lib_libarango_a_SOURCES = \
 	lib/ShapedJson/shape-accessor.c \
 	lib/ShapedJson/shaped-json.c \
 	lib/Statistics/statistics.cpp \
-	lib/Utilities/LineEditor.cpp \
+	lib/Utilities/LineEditor-readline.cpp \
 	lib/Utilities/ScriptLoader.cpp \
 	lib/Zip/ioapi.c \
 	lib/Zip/unzip.c \
diff --git a/lib/V8/V8LineEditor.cpp b/lib/V8/V8LineEditor.cpp
index 0df6a9c48d..27c4e66e08 100644
--- a/lib/V8/V8LineEditor.cpp
+++ b/lib/V8/V8LineEditor.cpp
@@ -37,7 +37,7 @@
 #include "BasicsC/tri-strings.h"
 #include "V8/v8-utils.h"
 
-#ifdef TRI_HAVE_LINENOISE
+#ifndef TRI_HAVE_LINENOISE
 #if RL_READLINE_VERSION >= 0x0500
 #define completion_matches rl_completion_matches
 #endif