diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3e477819c..2f528909c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,6 +60,16 @@ if(WIN32)
   set(WIN_EXTRA_LIBS_PATH "C:/Programs" CACHE PATH
     "Base path to extra libs/headers on Windows (SDL & pthreads folders should be in here).")
   list(APPEND CMAKE_PREFIX_PATH "${WIN_EXTRA_LIBS_PATH}" "${WIN_EXTRA_LIBS_PATH}/SDL")  # hints for FindSDL
+  
+  # Python check
+  find_package("PythonInterp")
+  if(PYTHONINTERP_FOUND)
+    message(STATUS "Python found, version: ${PYTHON_VERSION_STRING}")
+    get_filename_component(PYTHON_DIRECTORY ${PYTHON_EXECUTABLE} DIRECTORY)
+  else()
+    message(WARNING "Python not found! Most firmware and simu flavors not buildable.")
+    set(LUA NO)
+  endif()
 endif()
 
 find_package(Qt5Core)
diff --git a/companion/targets/windows/companion-vs.nsi.in b/companion/targets/windows/companion-vs.nsi.in
index 3ec3030ee..0ea9504e5 100644
--- a/companion/targets/windows/companion-vs.nsi.in
+++ b/companion/targets/windows/companion-vs.nsi.in
@@ -125,6 +125,8 @@ Section "OpenTX Companion @VERSION_FAMILY@" SecDummy
   File "@QT_DLL_DIR@\Qt5Multimedia.dll"
   File "@QT_DLL_DIR@\Qt5Svg.dll"
   File "@QT_DLL_DIR@\Qt5Xml.dll"
+  File "@PYTHON_DIRECTORY@\lib\site-packages\PyQt4\libeay32.dll"
+  File "@PYTHON_DIRECTORY@\lib\site-packages\PyQt4\ssleay32.dll"
 
   File "@SDL_DIR@\SDL.dll"
   File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\avrdude.exe"
@@ -139,6 +141,14 @@ Section "OpenTX Companion @VERSION_FAMILY@" SecDummy
   SetOutPath "$INSTDIR\imageformats"
   File "@QT_DLL_DIR@\..\plugins\imageformats\qjpeg.dll"
   File "@QT_DLL_DIR@\..\plugins\imageformats\qsvg.dll"
+  File "@QT_DLL_DIR@\..\plugins\imageformats\qdds.dll"
+  File "@QT_DLL_DIR@\..\plugins\imageformats\qgif.dll"
+  File "@QT_DLL_DIR@\..\plugins\imageformats\qicns.dll"
+  File "@QT_DLL_DIR@\..\plugins\imageformats\qico.dll"
+  File "@QT_DLL_DIR@\..\plugins\imageformats\qtga.dll"
+  File "@QT_DLL_DIR@\..\plugins\imageformats\qtiff.dll"
+  File "@QT_DLL_DIR@\..\plugins\imageformats\qwbmp.dll"
+  File "@QT_DLL_DIR@\..\plugins\imageformats\qwebp.dll"
 
   SetOutPath "$INSTDIR\mediaservice"
   File "@QT_DLL_DIR@\..\plugins\mediaservice\dsengine.dll"
@@ -216,6 +226,8 @@ Section "un.OpenTX Companion @VERSION_FAMILY@"
   Delete "$INSTDIR\libusb0.dll"
   Delete "$INSTDIR\dfu-util.exe"
   Delete "$INSTDIR\libusb-1.0.dll"
+  Delete "$INSTDIR\libeay32.dll"
+  Delete "$INSTDIR\ssleay32.dll"
   Delete "$INSTDIR\Uninstall.exe"
 
   Delete "$INSTDIR\lang\*.*"
diff --git a/radio/src/CMakeLists.txt b/radio/src/CMakeLists.txt
index a14eaf65b..41cd409e0 100644
--- a/radio/src/CMakeLists.txt
+++ b/radio/src/CMakeLists.txt
@@ -53,15 +53,6 @@ set(FIRMWARE_C_FLAGS_DEBUG "-g" CACHE STRING "Additional flags for firmware targ
 set(FIRMWARE_CXX_FLAGS "" CACHE STRING "Additional flags for firmware target c++ compiler (note: all CMAKE_CXX_FLAGS[_*] are ignored for firmware/bootloader).")
 set(FIRMWARE_CXX_FLAGS_DEBUG "-g" CACHE STRING "Additional flags for firmware target (Debug config) c++ compiler (note: CMAKE_CXX_FLAGS_DEBUG is ignored for firmware/bootloader).")
 
-# Python check
-find_package("PythonInterp")
-if(PYTHONINTERP_FOUND)
-  message(STATUS "Python found, version: ${PYTHON_VERSION_STRING}")
-else()
-  message(WARNING "Python not found! Most firmware and simu flavors not buildable.")
-  set(LUA NO)
-endif()
-
 set(THIRDPARTY_DIR thirdparty)
 set(LUA_DIR ${THIRDPARTY_DIR}/Lua/src)
 set(COOS_DIR ${THIRDPARTY_DIR}/CoOS)