diff --git a/premake4.lua b/premake4.lua
index e2be9e72a..b46ed21c7 100644
--- a/premake4.lua
+++ b/premake4.lua
@@ -1115,7 +1115,7 @@ solution "eepp"
 		set_targetdir("libs/" .. os.get_real() .. "/")
 		includedirs { "include", "src/modules/maps/include/","src/modules/maps/src/" }
 		files { "src/modules/maps/src/**.cpp" }
-
+		links { "eepp-shared" }
 		if not is_vs() then
 			buildoptions{ "-std=c++17" }
 		else
diff --git a/premake5.lua b/premake5.lua
index 2bb58c510..14896ffa5 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -852,6 +852,7 @@ workspace "eepp"
 		targetdir("libs/" .. os.target() .. "/")
 		incdirs { "include", "src/modules/maps/include/","src/modules/maps/src/" }
 		files { "src/modules/maps/src/**.cpp" }
+		links { "eepp-shared" }
 		build_base_cpp_configuration( "eepp-maps" )
 		filter "action:not vs*"
 			buildoptions { "-Wall" }
diff --git a/projects/macos/make.sh b/projects/macos/make.sh
index 02ff6dac8..4ba54d061 100755
--- a/projects/macos/make.sh
+++ b/projects/macos/make.sh
@@ -5,8 +5,11 @@ premake4 --file=../../premake4.lua --use-frameworks gmake
 cd ../../make/macosx/
 sed -e "s/-Wl,-x//g" -i .make
 
-make $@
+make -j`nproc` $@
 
 cd ../../bin/
 ln -sf ../libs/macosx/libeepp.dylib .
 ln -sf ../libs/macosx/libeepp-debug.dylib .
+if [ -f ../libs/macosx/libeepp-maps-debug.dylib ]; then
+ln -sf ../libs/macosx/libeepp-maps-debug.dylib .
+fi
diff --git a/projects/macos/make_no_fw.sh b/projects/macos/make_no_fw.sh
index 7617ebba3..ee43acff9 100755
--- a/projects/macos/make_no_fw.sh
+++ b/projects/macos/make_no_fw.sh
@@ -10,3 +10,6 @@ make -j`nproc` $@
 cd ../../bin/
 ln -sf ../libs/macosx/libeepp.dylib .
 ln -sf ../libs/macosx/libeepp-debug.dylib .
+if [ -f ../libs/macosx/libeepp-maps-debug.dylib ]; then
+ln -sf ../libs/macosx/libeepp-maps-debug.dylib .
+fi
diff --git a/src/tools/ecode/plugins/lsp/lspclientplugin.cpp b/src/tools/ecode/plugins/lsp/lspclientplugin.cpp
index d319d1e52..ffd499859 100644
--- a/src/tools/ecode/plugins/lsp/lspclientplugin.cpp
+++ b/src/tools/ecode/plugins/lsp/lspclientplugin.cpp
@@ -88,7 +88,7 @@ PluginRequestHandle LSPClientPlugin::processCodeCompletionRequest( const PluginM
 									PluginMessageFormat::CodeCompletion, &completionList, id );
 		} );
 
-	return ret;
+	return std::move( ret );
 }
 
 PluginRequestHandle LSPClientPlugin::processSignatureHelpRequest( const PluginMessage& msg ) {
@@ -105,7 +105,7 @@ PluginRequestHandle LSPClientPlugin::processSignatureHelpRequest( const PluginMe
 									PluginMessageFormat::SignatureHelp, &data, id );
 		} );
 
-	return ret;
+	return std::move( ret );
 }
 
 PluginRequestHandle LSPClientPlugin::processCancelRequest( const PluginMessage& msg ) {