diff --git a/.oppbuildspec b/.oppbuildspec
index 6224ba01..62e66422 100644
--- a/.oppbuildspec
+++ b/.oppbuildspec
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <buildspec version="4.0">
-    <dir makemake-options="--deep --nolink -O out --meta:recurse --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="." type="custom"/>
-    <dir makemake-options="--deep --make-so -o rinasim -O out -lrinasimcore --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="policies" type="makemake"/>
-    <dir makemake-options="--deep --make-lib -o rinasimcore -O out --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="src" type="makemake"/>
+    <dir makemake-options="--make-lib --deep -o rinasimcore -O out --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="src" type="makemake"/>
+    <dir path="." type="custom"/>
+    <dir makemake-options="--make-so --deep -o rinasim -O out -lrinasimcore$(D) --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="policies" type="makemake"/>
 </buildspec>
diff --git a/Makefile b/Makefile
index b6cd820c..91f77e22 100644
--- a/Makefile
+++ b/Makefile
@@ -51,7 +51,7 @@ all:
 # TODO: atrocious, rewrite
 #	$(Q)test -f src/Makefile -a -f policies/Makefile || make makefiles
 	$(qecho) Creating library librinasimcore ...
-	$(Q)if [ -d $(PROJECT_OUTPUT_DIR) ]; then \
+#	$(Q)if [ -d $(PROJECT_OUTPUT_DIR) ]; then \
 		find $(PROJECT_OUTPUT_DIR) -type f -name "librinasim.*" -exec rm -rf {} \;; fi
 	$(Q)cd src && $(MAKE) all
 	$(qecho) Creating library librinasim ...
@@ -87,7 +87,7 @@ msgheaders:
 clean: cleansrc cleanpolicies
 	$(qecho) Cleaning project ...
 	$(Q)rm -rf $(O)
-	$(Q)rm -f librinasim.so librinasim.dll librinasimcore.a librinasimcore.lib
+	$(Q)rm -f ./policies/librinasim.so ./policies/librinasim.dll ./src/librinasimcore.a ./src/librinasimcore.lib
 
 cleanall: clean
 	$(Q)rm -rf $(PROJECT_OUTPUT_DIR)
diff --git a/examples/Demos/UseCase5/.qtenvrc b/examples/Demos/UseCase5/.qtenvrc
new file mode 100644
index 00000000..e409e657
--- /dev/null
+++ b/examples/Demos/UseCase5/.qtenvrc
@@ -0,0 +1,3 @@
+[General]
+last-configname=Ping
+last-runnumber=0