diff --git a/.travis.yml b/.travis.yml
index ec76dcd1f..a51cfecf4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,7 +35,7 @@ addons:
       # The other ones from OpenMW ppa
       libbullet-dev, libswresample-dev, libopenscenegraph-3.4-dev, libmygui-dev,
       # tes3mp stuff
-      libboost1.61-dev, libqt5opengl5-dev
+      libboost1.61-dev, libqt5opengl5-dev, libluajit-5.1-dev
     ]
 
   coverity_scan:
@@ -60,8 +60,6 @@ matrix:
       env:
         - MATRIX_CC="CC=clang-3.8 && CXX=clang++-3.8"
   allow_failures:
-    - env:
-        - MATRIX_CC="CC=clang-3.8 && CXX=clang++-3.8"
     - env:
         - ANALYZE="scan-build-3.8 --use-cc clang-3.8 --use-c++ clang++-3.8 "
         - MATRIX_CC="CC=clang-3.8 && CXX=clang++-3.8"
diff --git a/CI/before_install.linux.sh b/CI/before_install.linux.sh
index e2313b443..704afe94b 100755
--- a/CI/before_install.linux.sh
+++ b/CI/before_install.linux.sh
@@ -19,15 +19,3 @@ git clone https://github.com/TES3MP/RakNet
 cd RakNet
 cmake . -DRAKNET_ENABLE_DLL=OFF -DRAKNET_ENABLE_SAMPLES=OFF -DCMAKE_BUILD_TYPE=Release
 make -j3
-
-cd ~/
-git clone https://github.com/Koncord/CallFF
-cd CallFF
-mkdir build
-cd build
-cmake ../
-make -j3
-
-cd ~/
-wget https://github.com/zdevito/terra/releases/download/release-2016-03-25/terra-Linux-x86_64-332a506.zip
-unzip terra-Linux-x86_64-332a506.zip
diff --git a/CI/before_script.linux.sh b/CI/before_script.linux.sh
index f1ba38415..4d74557ff 100755
--- a/CI/before_script.linux.sh
+++ b/CI/before_script.linux.sh
@@ -10,7 +10,6 @@ if [ ! -z "${MATRIX_CC}" ]; then
 fi
 
 export RAKNET_ROOT=~/RakNet
-export Terra_ROOT=~/terra-Linux-x86_64-332a506
 
 export CODE_COVERAGE=0
 if [ ! -z "${ANALYZE}" ]; then
@@ -38,5 +37,3 @@ ${ANALYZE}cmake .. \
     -DUSE_SYSTEM_TINYXML=TRUE \
     -DRakNet_LIBRARY_RELEASE=~/RakNet/lib/libRakNetLibStatic.a \
     -DRakNet_LIBRARY_DEBUG=~/RakNet/lib/libRakNetLibStatic.a \
-    -DCallFF_INCLUDES=~/CallFF/include \
-    -DCallFF_LIBRARY=~/CallFF/build/src/libcallff.a
diff --git a/apps/openmw-mp/CMakeLists.txt b/apps/openmw-mp/CMakeLists.txt
index 59dd2dab2..354b6d607 100644
--- a/apps/openmw-mp/CMakeLists.txt
+++ b/apps/openmw-mp/CMakeLists.txt
@@ -136,7 +136,7 @@ target_compile_definitions(tes3mp-server PRIVATE $<$<CONFIG:Debug>:SERVER_DEBUG>
 
 set_property(TARGET tes3mp-server PROPERTY CXX_STANDARD 14)
 if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-    target_compile_options(tes3mp-server PRIVATE -Wno-ignored-qualifiers -ftemplate-depth=2048)
+    target_compile_options(tes3mp-server PRIVATE -Wno-ignored-qualifiers -ftemplate-depth=4096)
 endif()
 
 target_link_libraries(tes3mp-server
diff --git a/apps/openmw-mp/stacktrace.cpp b/apps/openmw-mp/stacktrace.cpp
index 185f999a1..32f2a79d7 100644
--- a/apps/openmw-mp/stacktrace.cpp
+++ b/apps/openmw-mp/stacktrace.cpp
@@ -7,6 +7,7 @@
 
 #ifndef _WIN32
 
+#include <cxxabi.h>
 #include <execinfo.h>
 
 void stacktrace()
@@ -91,4 +92,4 @@ void stacktrace()
     LOG_APPEND(Log::LOG_FATAL, swc.getData().c_str());
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/cmake/FindSol2.cmake b/cmake/FindSol2.cmake
index 68a6a3447..7737ef697 100644
--- a/cmake/FindSol2.cmake
+++ b/cmake/FindSol2.cmake
@@ -6,6 +6,5 @@ include(LibFindMacros)
 
 libfind_pkg_detect(Sol2 sol2
     FIND_PATH sol.hpp
-)
+    PATHS ${CMAKE_SOURCE_DIR}/extern/sol/single/sol)
 libfind_process(Sol2)
-