diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1d606291..0241b416 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,9 +39,9 @@ set(LONG_DESCRIPTION "testplugin Plugin is used to test out the ODraw API and de
 
 set(VERSION_MAJOR "1")
 set(VERSION_MINOR "0")
-set(VERSION_PATCH "203")
+set(VERSION_PATCH "204")
 set(VERSION_TWEAK "0")
-set(VERSION_DATE "08/05/2022") # DD/MM/YYYY format
+set(VERSION_DATE "13/05/2022") # DD/MM/YYYY format
 set(OCPN_MIN_VERSION "ov50")
 set(OCPN_API_VERSION_MAJOR "1")
 set(OCPN_API_VERSION_MINOR "16")
diff --git a/cmake/PluginConfigure.cmake b/cmake/PluginConfigure.cmake
index f749e385..3a73f4c7 100644
--- a/cmake/PluginConfigure.cmake
+++ b/cmake/PluginConfigure.cmake
@@ -188,6 +188,8 @@ else()
     endif(MINGW)
 endif()
 
+message(STATUS "${CMLOC}ARCH: ${ARCH}")
+
 if("${PKG_BUILD_TARGET}" STREQUAL "")
     set(PKG_BUILD_TARGET "${PKG_TARGET}")
     set(PKG_TARGET_BUILD "-${PKG_BUILD_TARGET}")
@@ -222,10 +224,11 @@ else()
 endif(NOT WIN32 AND NOT APPLE AND NOT QT_ANDROID)
 
 if(NOT "${PKG_TARGET_GTK}"  STREQUAL "")
-    set(PKG_TARGET_GTK "-${PKG_TARGET_GTK}")
     set(PKG_BUILD_GTK "-${PKG_TARGET_GTK}")
+    set(PKG_TARGET_GTK "-${PKG_TARGET_GTK}")
 endif()
 
+message(STATUS "${CMLOC}PKG_NVR: ${PKG_NVR}, PKG_TARGET: ${PKG_TARGET}, ARCH: ${ARCH}, PKG_TARGET_WX_VER: ${PKG_TARGET_WX_VER}, PKG_BUILD_GTK: ${PKG_BUILD_GTK}, PKG_TARGET_VERSION: ${PKG_TARGET_VERSION}")
 if(DEFINED ENV{OCPN_TARGET})
     message(STATUS "${CMLOC}OCPN_TARGET defined: $ENV{OCPN_TARGET}")
     if(OCPN_FLATPAK_CONFIG OR OCPN_FLATPAK_BUILD OR MINGW)
@@ -253,7 +256,6 @@ message(STATUS "${CMLOC}PKG_BUILD_TARGET: ${PKG_BUILD_TARGET}")
 message(STATUS "${CMLOC}PKG_BUILD_GTK: ${PKG_TARGET_GTK}")
 message(STATUS "${CMLOC}PKG_BUILT_WITH_GTK: ${PKG_BUILT_WITH_GTK}")
 message(STATUS "${CMLOC}*.in files generated in ${CMAKE_CURRENT_BINARY_DIR}")
-message(STATUS "${CMLOC}PACKAGING_NAME_XML: ${PACKAGING_NAME_XML}")
 configure_file(${PROJECT_SOURCE_DIR}/cmake/in-files/plugin.xml.in ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGING_NAME_XML}.xml)
 configure_file(${PROJECT_SOURCE_DIR}/cmake/in-files/pkg_version.sh.in ${CMAKE_CURRENT_BINARY_DIR}/pkg_version.sh)
 configure_file(${PROJECT_SOURCE_DIR}/cmake/in-files/cloudsmith-upload.sh.in ${CMAKE_CURRENT_BINARY_DIR}/cloudsmith-upload.sh @ONLY)
diff --git a/cmake/PluginSetup.cmake b/cmake/PluginSetup.cmake
index ad119472..1f7ef63c 100644
--- a/cmake/PluginSetup.cmake
+++ b/cmake/PluginSetup.cmake
@@ -60,7 +60,7 @@ else()
 endif()
 
 message(STATUS "${CMLOC}OCPN_FLATPAK_CONFIG: ${OCPN_FLATPAK_CONFIG}, OCPN_FLATPAK_BUILD: ${OCPN_FLATPAK_BUILD}, UNIX: ${UNIX}")
-set(PKG_TARGET_WX_VER "")
+unset(PKG_TARGET_WX_VER)
 if(OCPN_FLATPAK_CONFIG OR OCPN_FLATPAK_BUILD)
     set(PKG_TARGET "flatpak")
     set(PKG_TARGET_VERSION "${SDK_VER}") # As of flatpak/*yaml
@@ -68,7 +68,7 @@ if(OCPN_FLATPAK_CONFIG OR OCPN_FLATPAK_BUILD)
     if( NOT "${WX_VER}" STREQUAL "" )
         set(PKG_TARGET_WX_VER "-${WX_VER}")
     else()
-        set(PKG_TARGET_WX_VER "")
+        unset(PKG_TARGET_WX_VER)
     endif()
     message(STATUS "${CMLOC}PKG_TARGET_WX_VER: ${PKG_TARGET_WX_VER}")
 elseif(MINGW)