diff --git a/source/backend/plugin/CarlaPluginThread.cpp b/source/backend/plugin/CarlaPluginThread.cpp
index fc7657c28..346693b12 100644
--- a/source/backend/plugin/CarlaPluginThread.cpp
+++ b/source/backend/plugin/CarlaPluginThread.cpp
@@ -148,7 +148,7 @@ void CarlaPluginThread::run()
 
     if (options.frontendWinId != 0)
     {
-        std::sprintf(strBuf, P_INTPTR, options.frontendWinId);
+        std::sprintf(strBuf, P_UINTPTR, options.frontendWinId);
         env.insert("ENGINE_OPTION_FRONTEND_WIN_ID", strBuf);
     }
 
diff --git a/source/backend/standalone/CarlaStandalone.cpp b/source/backend/standalone/CarlaStandalone.cpp
index d9591a59e..b0afaa769 100644
--- a/source/backend/standalone/CarlaStandalone.cpp
+++ b/source/backend/standalone/CarlaStandalone.cpp
@@ -503,7 +503,7 @@ bool carla_engine_init(const char* driverName, const char* clientName)
     if (gStandalone.engineOptions.frontendWinId != 0)
     {
         char strBuf[STR_MAX+1];
-        std::sprintf(strBuf, P_INTPTR, gStandalone.engineOptions.frontendWinId);
+        std::sprintf(strBuf, P_UINTPTR, gStandalone.engineOptions.frontendWinId);
         gStandalone.engine->setOption(CB::ENGINE_OPTION_FRONTEND_WIN_ID, 0, strBuf);
     }
     else
diff --git a/source/utils/CarlaThread.hpp b/source/utils/CarlaThread.hpp
index 5b426a052..0688ad791 100644
--- a/source/utils/CarlaThread.hpp
+++ b/source/utils/CarlaThread.hpp
@@ -58,7 +58,7 @@ public:
      */
     bool isRunning() const noexcept
     {
-#ifdef CARLA_OS_WIN32
+#ifdef CARLA_OS_WIN
         return (fHandle.p != nullptr);
 #else
         return (fHandle != 0);
@@ -171,7 +171,7 @@ private:
 
     void _init() noexcept
     {
-#ifdef CARLA_OS_WIN32
+#ifdef CARLA_OS_WIN
         fHandle.p = nullptr;
         fHandle.x = 0;
 #else