diff --git a/.gitignore b/.gitignore
index d41f12ba70..d461991781 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ Makefile
 /.bash_history
 /.local/
 /.config/
+/indicationlog
diff --git a/scripts/Makefile b/scripts/Makefile
index c1d33bf901..12b6a957ab 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -218,7 +218,7 @@ pester-tests: $(RUN_TARGETS) prepare
 hashbang-tests: all prepare
 	PATH=$(PATH):$(MONAD)/scripts/$(APP_BASE) $(MONAD)/scripts/3rdparty/hashbang/script.ps1
 
-test: native-tests xunit-tests pester-tests hashbang-tests psrp-tests
+test: psrp-tests native-tests xunit-tests pester-tests hashbang-tests
 
 # debug/trace targets
 
@@ -234,20 +234,25 @@ OMI_FLAGS=--dev --enable-debug
 $(OMI)/GNUmakefile:
 	cd $(OMI) && ./configure $(OMI_FLAGS)
 
-$(OMI)/output/bin/omiserver: $(OMI)/GNUmakefile
+OMISERVER=$(OMI)/output/bin/omiserver
+$(OMISERVER): $(OMI)/GNUmakefile
 	$(MAKE) -j -C $(OMI)
 
-omi: $(OMI)/output/bin/omiserver
+omi: $(OMISERVER)
 
 MONAD_PROVIDER=$(MONAD)/src/monad-omi-provider
-$(OMI)/output/lib/libTestShell.so: omi
+PSRP_OMI_PROVIDER=$(OMI)/output/lib/libTestShell.so
+$(PSRP_OMI_PROVIDER): $(OMISERVER)
 	$(MAKE) -j -C $(MONAD_PROVIDER)
 
-psrp: $(OMI)/output/lib/libTestShell.so
+psrp: $(PSRP_OMI_PROVIDER)
 
-psrp-tests: omi
+psrp-tests: $(OMISERVER)
 	$(MAKE) -C $(OMI) tests
 
+# phony targets so that the recursive make is always invoked
+.PHONY: $(OMISERVER) $(PSRP_OMI_PROVIDER)
+
 # quoting here is a bit special if strings are passed in, because lldb
 # seems to forward arguments strangely
 debug: $(RUN_TARGETS) prepare
diff --git a/src/monad-native b/src/monad-native
index ad49db74e2..7196afc5ad 160000
--- a/src/monad-native
+++ b/src/monad-native
@@ -1 +1 @@
-Subproject commit ad49db74e24758377c3735bf9a40fd06ea2b2b20
+Subproject commit 7196afc5ad43d69f658a45bb4b72a91d5e4b8331
diff --git a/src/omi b/src/omi
index 7ddc081ca0..7c3605bd38 160000
--- a/src/omi
+++ b/src/omi
@@ -1 +1 @@
-Subproject commit 7ddc081ca010ac830ae09691a7f4f17244c6cd30
+Subproject commit 7c3605bd38a0879a8faa76626299283251538d96