diff --git a/Makefile b/Makefile
index 4871308..4d665ac 100644
--- a/Makefile
+++ b/Makefile
@@ -140,8 +140,7 @@ endif
 # --------------------------------------------------------------
 # MOD builds
 
-EXTRA_MOD_FLAGS  = -I../include/single-precision -fsingle-precision-constant
-
+EXTRA_MOD_FLAGS  = -I../include/single-precision -fsingle-precision-constant -Wno-attributes
 ifeq ($(MODDUO),true)
 EXTRA_MOD_FLAGS += -mno-unaligned-access
 endif
@@ -149,51 +148,9 @@ ifeq ($(WITH_LTO),true)
 EXTRA_MOD_FLAGS += -ffat-lto-objects
 endif
 
-MOD_WORKDIR ?= $(HOME)/mod-workdir
-MOD_ENVIRONMENT = \
-	AR=${1}/host/usr/bin/${2}-gcc-ar \
-	CC=${1}/host/usr/bin/${2}-gcc \
-	CPP=${1}/host/usr/bin/${2}-cpp \
-	CXX=${1}/host/usr/bin/${2}-g++ \
-	LD=${1}/host/usr/bin/${2}-ld \
-	PKG_CONFIG=${1}/host/usr/bin/pkg-config \
-	STRIP=${1}/host/usr/bin/${2}-strip \
-	CFLAGS="-I${1}/staging/usr/include $(EXTRA_MOD_FLAGS)" \
-	CPPFLAGS= \
-	CXXFLAGS="-I${1}/staging/usr/include $(EXTRA_MOD_FLAGS) -Wno-attributes" \
-	LDFLAGS="-L${1}/staging/usr/lib $(EXTRA_MOD_FLAGS)" \
-	EXE_WRAPPER="qemu-${3}-static -L ${1}/target" \
-	HEADLESS=true \
-	MOD_BUILD=true \
-	NOOPT=true \
-	STATIC_BUILD=true
-
-modduo:
-	$(MAKE) $(call MOD_ENVIRONMENT,$(MOD_WORKDIR)/modduo-static,arm-mod-linux-gnueabihf.static,arm)
-
-modduox:
-	$(MAKE) $(call MOD_ENVIRONMENT,$(MOD_WORKDIR)/modduox-static,aarch64-mod-linux-gnueabi.static,aarch64)
-
-moddwarf:
-	$(MAKE) $(call MOD_ENVIRONMENT,$(MOD_WORKDIR)/moddwarf,aarch64-mod-linux-gnu,aarch64)
-
-publish:
-	tar -C bin -cz $(subst bin/,,$(wildcard bin/*.lv2)) | base64 | curl -F 'package=@-' http://192.168.51.1/sdk/install && echo
-
-ifneq (,$(findstring modduo-,$(MAKECMDGOALS)))
-$(MAKECMDGOALS):
-	$(MAKE) $(call MOD_ENVIRONMENT,$(MOD_WORKDIR)/modduo-static,arm-mod-linux-gnueabihf.static,arm) $(subst modduo-,,$(MAKECMDGOALS))
-endif
-
-ifneq (,$(findstring modduox-,$(MAKECMDGOALS)))
-$(MAKECMDGOALS):
-	$(MAKE) $(call MOD_ENVIRONMENT,$(MOD_WORKDIR)/modduox-static,aarch64-mod-linux-gnueabi.static,aarch64) $(subst modduox-,,$(MAKECMDGOALS))
-endif
-
-ifneq (,$(findstring moddwarf-,$(MAKECMDGOALS)))
-$(MAKECMDGOALS):
-	$(MAKE) $(call MOD_ENVIRONMENT,$(MOD_WORKDIR)/moddwarf,aarch64-mod-linux-gnu,aarch64) $(subst moddwarf-,,$(MAKECMDGOALS))
-endif
+MOD_ENVIRONMENT += HEADLESS=true
+MOD_ENVIRONMENT += MOD_BUILD=true
+MOD_ENVIRONMENT += STATIC_BUILD=true
 
 # --------------------------------------------------------------
 # Individual targets
diff --git a/carla b/carla
index 76cdd50..9ce3534 160000
--- a/carla
+++ b/carla
@@ -1 +1 @@
-Subproject commit 76cdd50bfa8c3e7c96bb33c239916b0e28e2ce92
+Subproject commit 9ce3534a0181d9e7dc13e2cebb99fbd5cbac15d2
diff --git a/deps/PawPaw b/deps/PawPaw
index b4c1de9..4baef39 160000
--- a/deps/PawPaw
+++ b/deps/PawPaw
@@ -1 +1 @@
-Subproject commit b4c1de98b8ac60b95a7ced6959062e4e2a863fd6
+Subproject commit 4baef39af5709ec44ee523b49a994a922dc3c4f0
diff --git a/dpf b/dpf
index 8e0eaa4..3aa409b 160000
--- a/dpf
+++ b/dpf
@@ -1 +1 @@
-Subproject commit 8e0eaa4ddd9d851da00a5f96d9c6ea6bad3c5c07
+Subproject commit 3aa409b828c1b65e9043df9a30ac781dd2c9ad74