diff --git a/src/servers/sapphire_api/main.cpp b/src/servers/sapphire_api/main.cpp
index 1a6fe25f..bcce3189 100644
--- a/src/servers/sapphire_api/main.cpp
+++ b/src/servers/sapphire_api/main.cpp
@@ -739,7 +739,7 @@ void defaultGet( shared_ptr<HttpServer::Response> response, shared_ptr<HttpServe
 
 int main( int argc, char* argv[] )
 {
-   g_log.setLogPath( "log\\SapphireAPI" );
+   g_log.setLogPath( "log/SapphireAPI" );
    g_log.init();
 
    g_log.info( "===========================================================" );
diff --git a/src/servers/sapphire_lobby/ServerLobby.cpp b/src/servers/sapphire_lobby/ServerLobby.cpp
index 9c0e05d3..80e13d89 100644
--- a/src/servers/sapphire_lobby/ServerLobby.cpp
+++ b/src/servers/sapphire_lobby/ServerLobby.cpp
@@ -54,7 +54,7 @@ namespace Core {
 
    void ServerLobby::run( int32_t argc, char* argv[] )
    {
-      g_log.setLogPath( "log\\SapphireLobby" );
+      g_log.setLogPath( "log/SapphireLobby" );
       g_log.init();
 
       g_log.info( "===========================================================" );
diff --git a/src/servers/sapphire_zone/Script/Scripts/CMakeLists.txt b/src/servers/sapphire_zone/Script/Scripts/CMakeLists.txt
index aeaa0094..03c76b3c 100644
--- a/src/servers/sapphire_zone/Script/Scripts/CMakeLists.txt
+++ b/src/servers/sapphire_zone/Script/Scripts/CMakeLists.txt
@@ -21,7 +21,8 @@ foreach(_scriptDir ${children})
     if(IS_DIRECTORY ${_scriptDir} AND NOT ${_name} MATCHES "CMakeFiles")
         message("discovered plugin lib: ${_scriptDir} (${_name})")
 
-        file(GLOB_RECURSE SCRIPT_FILES "${_scriptDir}/*.cpp")
+        file(GLOB_RECURSE SCRIPT_BUILD_FILES "${_scriptDir}/*.cpp")
+        file(GLOB_RECURSE SCRIPT_FILES RELATIVE "${_scriptDir}" "${_name}/*.cpp")
 
         # build file list
         foreach(_script ${SCRIPT_FILES})
@@ -38,7 +39,7 @@ foreach(_scriptDir ${children})
             endif()
         endforeach()
 
-        add_library("script_${_name}" MODULE "${SCRIPT_FILES}" "${SCRIPT_INCLUDE_FILES}" "${_scriptDir}/ScriptLoader.cpp")
+        add_library("script_${_name}" MODULE "${SCRIPT_BUILD_FILES}" "${SCRIPT_INCLUDE_FILES}" "${_scriptDir}/ScriptLoader.cpp")
         target_link_libraries("script_${_name}" sapphire_zone)
 
         if(MSVC)
@@ -55,11 +56,13 @@ foreach(_scriptDir ${children})
 
         configure_file("${CMAKE_CURRENT_SOURCE_DIR}/ScriptLoader.cpp.in" "${_scriptDir}/ScriptLoader.cpp")
 
-        add_custom_command(TARGET "script_${_name}" POST_BUILD
-            COMMAND ${CMAKE_COMMAND} -E remove "${SCRIPT_LIB_DIR}/script_${_name}.exp"
-            COMMAND ${CMAKE_COMMAND} -E remove "${SCRIPT_LIB_DIR}/script_${_name}.lib"
-            COMMAND ${CMAKE_COMMAND} -E remove "${SCRIPT_LIB_DIR}/script_${_name}.ilk"
-        )
+        if(MSVC)
+            add_custom_command(TARGET "script_${_name}" POST_BUILD
+                COMMAND ${CMAKE_COMMAND} -E remove "${SCRIPT_LIB_DIR}/script_${_name}.exp"
+                COMMAND ${CMAKE_COMMAND} -E remove "${SCRIPT_LIB_DIR}/script_${_name}.lib"
+                COMMAND ${CMAKE_COMMAND} -E remove "${SCRIPT_LIB_DIR}/script_${_name}.ilk"
+            )
+        endif()
 
         unset(ScriptIncludes)
         unset(ScriptNames)
diff --git a/src/servers/sapphire_zone/ServerZone.cpp b/src/servers/sapphire_zone/ServerZone.cpp
index ee723654..9f2f3785 100644
--- a/src/servers/sapphire_zone/ServerZone.cpp
+++ b/src/servers/sapphire_zone/ServerZone.cpp
@@ -193,7 +193,7 @@ bool Core::ServerZone::loadSettings( int32_t argc, char* argv[] )
 void Core::ServerZone::run( int32_t argc, char* argv[] )
 {
    // TODO: add more error checks for the entire initialisation
-   g_log.setLogPath( "log\\SapphireZone_" );
+   g_log.setLogPath( "log/SapphireZone_" );
    g_log.init();
 
    printBanner();