diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
index c7d3e115..875984bf 100644
--- a/cmake/Dependencies.cmake
+++ b/cmake/Dependencies.cmake
@@ -30,10 +30,10 @@ add_subdirectory(${CMAKE_SOURCE_DIR}/thirdparty/entt)
 
 # OpenAL
 find_package(OpenAL REQUIRED)
-AddImportedTarget(OpenAL::OpenAL
-  ${OPENAL_LIBRARY}
-  ${OPENAL_INCLUDE_DIR}
-)
+#AddImportedTarget(OpenAL::OpenAL
+ # ${OPENAL_LIBRARY}
+  #${OPENAL_INCLUDE_DIR}
+#)
 
 if(TARGET_OS_IOS)
   set(THIRDPARTY_IOS_DIR_PATH ${CMAKE_SOURCE_DIR}/thirdparty/ios)
@@ -92,10 +92,10 @@ find_package(FFmpeg REQUIRED COMPONENTS
 
 # swresample
 find_package(Libswresample REQUIRED)
-AddImportedTarget(SWRESAMPLE::SWRESAMPLE 
-  ${LIBSWRESAMPLE_LIBRARIES}
-  ${LIBSWRESAMPLE_INCLUDE_DIRS}
-)
+#AddImportedTarget(SWRESAMPLE::SWRESAMPLE 
+ # ${LIBSWRESAMPLE_LIBRARIES}
+  #${LIBSWRESAMPLE_INCLUDE_DIRS}
+#)
 
 endif() # TARGET_OS_IOS
 
diff --git a/cmake/Preamble.cmake b/cmake/Preamble.cmake
index 028e98c8..a68b75dc 100644
--- a/cmake/Preamble.cmake
+++ b/cmake/Preamble.cmake
@@ -16,6 +16,6 @@ endif()
 
 include(cmake/PreventInSourceBuild.cmake)
 include(cmake/PlatformCheck.cmake)
-include(cmake/AddImportedTarget.cmake)
+#include(cmake/AddImportedTarget.cmake)
 include(cmake/Dependencies.cmake)
 include(cmake/ProjectOptions.cmake)
diff --git a/src/Audio/CMakeLists.txt b/src/Audio/CMakeLists.txt
index ea740a92..6d31fcb5 100644
--- a/src/Audio/CMakeLists.txt
+++ b/src/Audio/CMakeLists.txt
@@ -21,7 +21,7 @@ target_link_libraries(Audio
   PRIVATE ProjectOptions
   PRIVATE System
   PUBLIC FFmpegUtil
-  PUBLIC OpenAL::OpenAL
-  PRIVATE SWRESAMPLE::SWRESAMPLE
-  PRIVATE SDL2::SDL2
+  PUBLIC OpenAL:OpenAL
+  PRIVATE SWRESAMPLE:SWRESAMPLE
+  PRIVATE SDL2:SDL2
 )
diff --git a/src/ECS/CMakeLists.txt b/src/ECS/CMakeLists.txt
index 9d974d05..4691c1b1 100644
--- a/src/ECS/CMakeLists.txt
+++ b/src/ECS/CMakeLists.txt
@@ -21,8 +21,8 @@ target_include_directories(ECS PRIVATE ../)
 target_link_libraries(ECS 
   PRIVATE ProjectOptions
   PRIVATE System
-  PUBLIC EnTT::EnTT
+  PUBLIC EnTT:EnTT
   PUBLIC Common
-  PRIVATE SDL2::SDL2
+  PRIVATE SDL2:SDL2
 )
 
diff --git a/src/Events/CMakeLists.txt b/src/Events/CMakeLists.txt
index 4b417645..75537f7b 100644
--- a/src/Events/CMakeLists.txt
+++ b/src/Events/CMakeLists.txt
@@ -15,5 +15,5 @@ source_group("Source Files" FILES ${EVENTS_SOURCE_FILES})
 target_include_directories(Events PRIVATE ../)
 target_link_libraries(Events
   PRIVATE ProjectOptions
-  PRIVATE SDL2::SDL2
+  PRIVATE SDL2:SDL2
 )
diff --git a/src/FFMPEG/CMakeLists.txt b/src/FFMPEG/CMakeLists.txt
index a6fbea90..7efe8bd4 100644
--- a/src/FFMPEG/CMakeLists.txt
+++ b/src/FFMPEG/CMakeLists.txt
@@ -11,9 +11,9 @@ target_include_directories(FFmpegUtil PRIVATE ../)
 target_link_libraries(FFmpegUtil
   PRIVATE ProjectOptions
   PRIVATE System
-  PUBLIC FFMPEG::AVCODEC
-  PUBLIC FFMPEG::AVFORMAT
-  PUBLIC FFMPEG::AVUTIL
-  PUBLIC FFMPEG::SWSCALE 
+  PUBLIC FFMPEG:AVCODEC
+  PUBLIC FFMPEG:AVFORMAT
+  PUBLIC FFMPEG:AVUTIL
+  PUBLIC FFMPEG:SWSCALE 
 )
 
diff --git a/src/FFMPEG/FFmpegUtil.cpp b/src/FFMPEG/FFmpegUtil.cpp
index 2ce58de4..a84e2896 100644
--- a/src/FFMPEG/FFmpegUtil.cpp
+++ b/src/FFMPEG/FFmpegUtil.cpp
@@ -4,7 +4,7 @@
 using namespace Sourcehold;
 using namespace System;
 
-static AVInputFormat *bink_input;
+static AVInputFormat *bink_input const;
 bool Game::InitAvcodec() {
   av_log_set_level(AV_LOG_ERROR);
   bink_input = av_find_input_format("bink");
diff --git a/src/GUI/CMakeLists.txt b/src/GUI/CMakeLists.txt
index 4c615a50..a8ad5f75 100644
--- a/src/GUI/CMakeLists.txt
+++ b/src/GUI/CMakeLists.txt
@@ -40,10 +40,10 @@ target_include_directories(GUI PRIVATE ../)
 target_link_libraries(GUI
   PRIVATE ProjectOptions
   PRIVATE System
-  PRIVATE SDL2::SDL2
+  PRIVATE SDL2:SDL2
   # GUI includes World.h .. fix this !
   # GUI doesnt use EnTT!
-  PRIVATE EnTT::EnTT
+  PRIVATE EnTT:EnTT
   PRIVATE Audio
   PUBLIC Common
 )
diff --git a/src/Rendering/CMakeLists.txt b/src/Rendering/CMakeLists.txt
index b90bc053..07199d7e 100644
--- a/src/Rendering/CMakeLists.txt
+++ b/src/Rendering/CMakeLists.txt
@@ -33,8 +33,8 @@ target_link_libraries(Rendering
   PRIVATE System
   PRIVATE FFmpegUtil
   PUBLIC Common
-  PUBLIC Sourcehold::SDL 
-  PRIVATE OpenAL::OpenAL
+  PUBLIC Sourcehold:SDL 
+  PRIVATE OpenAL:OpenAL
 )
 
 add_library(Sourcehold::Rendering ALIAS Rendering)
diff --git a/src/SDL/CMakeLists.txt b/src/SDL/CMakeLists.txt
index 7ce11fff..6ea0a19b 100644
--- a/src/SDL/CMakeLists.txt
+++ b/src/SDL/CMakeLists.txt
@@ -16,7 +16,7 @@ target_include_directories(SourceholdSDL
 target_link_libraries(SourceholdSDL
   PRIVATE ProjectOptions
   PRIVATE System
-  PUBLIC SDL2::SDL2
+  PUBLIC SDL2:SDL2
   PUBLIC Common
 )