diff --git a/Dockerfile.dev b/Dockerfile.dev
index 452a7c6a0..7c56160be 100644
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -16,8 +16,7 @@ FROM fedora:latest
 MAINTAINER Steffen Vogel <stvogel@eonerc.rwth-aachen.de>
 
 # Toolchain
-RUN dnf -y update && \
-    dnf -y install \
+RUN dnf -y install \
 	gcc gcc-c++ \
 	pkgconfig make cmake \
 	autoconf automake autogen libtool \
@@ -25,8 +24,7 @@ RUN dnf -y update && \
 	texinfo git
 
 # Dependencies
-RUN dnf -y update && \
-    dnf -y install \
+RUN dnf -y install \
 	openssl openssl-devel \
 	libconfig-devel \
 	libnl3-devel \
@@ -34,8 +32,7 @@ RUN dnf -y update && \
 	jansson-devel
 
 # Several tools only needed for developement and testing
-RUN dnf -y update && \
-    dnf -y install \
+RUN dnf -y install \
 	doxygen dia graphviz \
 	openssh-clients \
 	rpmdevtools rpm-build \
@@ -45,6 +42,12 @@ RUN dnf -y update && \
 	valgrind \
 	gdb
 
+# 32bit versions of some standard libraries for RT-LAB code
+RUN dnf -y install \
+	libstdc++-devel.i686 \
+	libuuid-devel.i686 \
+	glibc-devel.i686
+
 # Tools for debugging, coverage, profiling
 RUN pip install \
         gcovr
diff --git a/Makefile b/Makefile
index a29611331..5d40c3f88 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@
 ###################################################################################
 
 # Project modules
-MODULES = lib plugins src tests thirdparty tools packaging doc etc web
+MODULES = clients lib plugins src tests thirdparty tools packaging doc etc web
 
 # Default prefix for install target
 PREFIX ?= /usr/local
diff --git a/clients/Makefile.inc b/clients/Makefile.inc
index 1f067acde..94fb31e70 100644
--- a/clients/Makefile.inc
+++ b/clients/Makefile.inc
@@ -1,19 +1,20 @@
-ASYNCIP_PATH = $(SRCDIR)/clients/opal/udp/models/send_receive
+ASYNCIP_PATH = $(SRCDIR)/clients/opal/villas_udp/models/send_receive
 
-clients: clients-opal
-	
-clients-opal:
-	$(MAKE) -C $(ASYNCIP_PATH) -f Makefile.mk AsyncIP \
-		RTLAB_INTEL_COMPILER=0 \
+ASYNCIP_OPTS = RTLAB_INTEL_COMPILER=0 \
 		PROTOCOL=GTNET_SKT \
 		OPAL_LIBS="-lSystem -luuid" \
 		OPAL_LIBPATH=-L$(SRCDIR)/thirdparty/libopal/ \
 		OPAL_INCPATH=-I$(SRCDIR)/thirdparty/libopal/include/opal
 
+clients: clients-opal
+	
+clients-opal:
+	$(MAKE) -C $(ASYNCIP_PATH) -f Makefile.mk AsyncIP $(ASYNCIP_OPTS)
+
 clean-clients:
-	$(MAKE) -C $(ASYNCIP_PATH) -f Makefile.mk clean
+	$(MAKE) -C $(ASYNCIP_PATH) -f Makefile.mk clean $(ASYNCIP_OPTS)
 
 install-clients:
-	$(MAKE) -C $(ASYNCIP_PATH) -f Makefile.mk install
+	$(MAKE) -C $(ASYNCIP_PATH) -f Makefile.mk install $(ASYNCIP_OPTS)
 
 .PHONY: clients clean-clients install-clients
\ No newline at end of file
diff --git a/clients/opal/villas_udp/models/send_receive/Makefile.mk b/clients/opal/villas_udp/models/send_receive/Makefile.mk
index b56efb1d6..c5a0c6a3e 100644
--- a/clients/opal/villas_udp/models/send_receive/Makefile.mk
+++ b/clients/opal/villas_udp/models/send_receive/Makefile.mk
@@ -1,6 +1,6 @@
 TARGET = AsyncIP
 
-VPATH = $(SRCDIR)/src
+VPATH = src
 
 RTLAB_INTEL_COMPILER ?= 1
 
@@ -49,7 +49,7 @@ install: $(TARGET)
 	install -m 0755 -D -t $(DESTDIR)$(PREFIX)/bin $(TARGET)
 
 clean:
-	rm -f $(OBJS) $(TARGET)
+	rm -f $(OBJS) $(OBJS:%.o=%.d) $(TARGET)
 
 $(TARGET): $(OBJS)
 	$(LD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)