diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9d753a014..ea3d0e56f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -99,7 +99,7 @@ jobs:
         run: make posix32 -j $(nproc)
 
   ubuntu-mingw-win32:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-18.04
     env:
       CC: i686-w64-mingw32-gcc
       CXX: i686-w64-mingw32-g++
diff --git a/source/includes/CarlaDefines.h b/source/includes/CarlaDefines.h
index a6bce6ff5..82c2739ed 100644
--- a/source/includes/CarlaDefines.h
+++ b/source/includes/CarlaDefines.h
@@ -317,8 +317,9 @@ private:                                        \
 
 /* Useful typedefs */
 typedef unsigned char uchar;
-typedef unsigned long int ulong;
 typedef unsigned short int ushort;
 typedef unsigned int uint;
+typedef unsigned long int ulong;
+typedef unsigned long long int ulonglong;
 
 #endif /* CARLA_DEFINES_H_INCLUDED */