diff --git a/Makefile b/Makefile
index 65b6a1db3..4dbdbb6bf 100644
--- a/Makefile
+++ b/Makefile
@@ -52,6 +52,7 @@ LDFLAGS += -L$(BUILDDIR)
 
 # Some tools
 PKGCONFIG := PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/lib/pkgconfig:$(PKG_CONFIG_PATH) pkg-config
+SHELL := bash
 
 # We must compile without optimizations for gcov!
 ifdef DEBUG
diff --git a/lib/Makefile.villas.inc b/lib/Makefile.villas.inc
index c0033e851..414f3f5ee 100644
--- a/lib/Makefile.villas.inc
+++ b/lib/Makefile.villas.inc
@@ -56,6 +56,9 @@ ifndef WITHOUT_NANOMSG
 ifeq ($(shell $(PKGCONFIG) nanomsg; echo $$?),0)
 	LIB_SRCS    += lib/nodes/nanomsg.c
 	LIB_PKGS    += nanomsg
+else ifeq ($(shell $(PKGCONFIG) libnanomsg; echo $$?),0)
+	LIB_SRCS    += lib/nodes/nanomsg.c
+	LIB_PKGS    += libnanomsg
 endif
 endif
 
@@ -95,17 +98,17 @@ endif
 
 # Enable OPAL-RT Asynchronous Process support (will result in 32bit binary!!!)
 ifdef WITH_OPAL
-ifneq ($(wildcard thirdparty/opal/include/AsyncApi.h),)
+ifneq ($(wildcard thirdparty/libopal/include/opal/AsyncApi.h),)
 	LIB_OBJS    += opal.o
 
-	LIB_CFLAGS  += -I thirdparty/opal/include
-	LIB_LDFLAGS += -L/lib/i386-linux-gnu/ -L/usr/lib/i386-linux-gnu/ -Lthirdparty/opal/lib/redhawk/
+	LIB_CFLAGS  += -I thirdparty/libopal/include/opal/
+	LIB_LDFLAGS += -L/lib/i386-linux-gnu/ -L/usr/lib/i386-linux-gnu/ -Lthirdparty/libopal/
 	LIB_LDLIBS  += -lOpalAsyncApiCore -lOpalCore -lOpalUtils -lirc
 
 	# libOpalAsyncApi is a 32bit library. So we need to build everything in 32bit
 	CFLAGS      += -m32
 	LDFLAGS     += -m32
-	BUILDDIR    := $(BUILDDIR)32
+	BUILDDIR    := $(BUILDDIR)
 endif
 endif
 
diff --git a/tests/unit/Makefile.inc b/tests/unit/Makefile.inc
index 1ccd9624f..40fae311e 100644
--- a/tests/unit/Makefile.inc
+++ b/tests/unit/Makefile.inc
@@ -38,7 +38,7 @@ $(BUILDDIR)/tests/unit/%.o: tests/unit/%.c $(BUILDDIR)/defines | $$(dir $$@)
 
 # Link
 $(BUILDDIR)/unit-tests: $(TEST_OBJS) $(LIB)
-	$(CC) $(TEST_LDFLAGS) $(TEST_LDLIBS) $^ -o $@
+	$(CC) $(TEST_LDFLAGS) $^ $(TEST_LDLIBS) -o $@
 
 ifdef COVERAGE
 -include tests/unit/Makefile.gcov.inc