diff --git a/omibuild.sh b/omibuild.sh
index f901b3806..756b995dc 100755
--- a/omibuild.sh
+++ b/omibuild.sh
@@ -1,13 +1,13 @@
 #!/usr/bin/env bash
 
 # Build OMI
-cd src/omi/Unix
+pushd src/omi/Unix
 ./configure --dev
 make -j
-cd ../../..
+popd
 
 # Build the OMI Provider
-cd src/omi-provider
-cmake .
+pushd src/omi-provider
+cmake -DCMAKE_BUILD_TYPE=Debug .
 make -j
-cd ../..
+popd
diff --git a/psrp.sh b/psrp.sh
index 090a11c67..eb42adc06 100755
--- a/psrp.sh
+++ b/psrp.sh
@@ -1,2 +1,2 @@
 export CORE_ROOT=$(pwd)/bin
-lldb-3.6 -o "plugin load ./bin/libsosplugin.so" -- ./src/omi/Unix/output/bin/omiserver --ignoreAuthentication -l --loglevel 2
+sudo -E ./src/omi/Unix/output/bin/omiserver -l --loglevel 2
diff --git a/src/omi b/src/omi
index 6e8fafe1d..3b24543f6 160000
--- a/src/omi
+++ b/src/omi
@@ -1 +1 @@
-Subproject commit 6e8fafe1d5cd099fce70979068c3b301ae383b6f
+Subproject commit 3b24543f61b42dc47ec3f3eb83ef7e2a48e171f0
diff --git a/src/omi-provider b/src/omi-provider
index 68a9f8ae7..d9b7fde13 160000
--- a/src/omi-provider
+++ b/src/omi-provider
@@ -1 +1 @@
-Subproject commit 68a9f8ae76a8a2dfe530fa4174f717b567e456fd
+Subproject commit d9b7fde13e159016f505081603a5f67bcd2b4871