diff --git a/stage4/07-pisdr-sdrplay/00-run.sh b/stage4/07-pisdr-sdrplay/00-run.sh
index 8b7462b..4c5ffd7 100755
--- a/stage4/07-pisdr-sdrplay/00-run.sh
+++ b/stage4/07-pisdr-sdrplay/00-run.sh
@@ -15,5 +15,5 @@ chmod +x ./SDRplay_RSP_API-ARM32-3.07.2.run
 sed -i 's/more sdrplay_license.txt//g' install_lib.sh
 sed -i 's/armv7l/armv8l/g' install_lib.sh
 printf "\ny\ny\ny\n" | ./install_lib.sh
-systemctl enable --now sdrplay
-EOF
+systemctl enable sdrplay
+EOF
\ No newline at end of file
diff --git a/stage4/22-pisdr-hamlib/00-run.sh b/stage4/22-pisdr-hamlib/00-run.sh
index 37f2164..ed34c84 100755
--- a/stage4/22-pisdr-hamlib/00-run.sh
+++ b/stage4/22-pisdr-hamlib/00-run.sh
@@ -12,5 +12,6 @@ cd Hamlib
 ./bootstrap
 ./configure --with-python-binding
 make -j$(nproc)
+make install
 ldconfig
 EOF
\ No newline at end of file
diff --git a/stage4/23-pisdr-gpredict/00-run.sh b/stage4/23-pisdr-gpredict/00-run.sh
index 805f6a0..4ab1aed 100755
--- a/stage4/23-pisdr-gpredict/00-run.sh
+++ b/stage4/23-pisdr-gpredict/00-run.sh
@@ -10,6 +10,7 @@ fi
 
 cd gpredict
 bash autogen.sh
-make -j$(nproc) install
+make -j$(nproc)
+make install
 ldconfig
 EOF
\ No newline at end of file
diff --git a/stage4/30-pisdr-leandvb/00-run.sh b/stage4/30-pisdr-leandvb/00-run.sh
index 6167891..7004772 100755
--- a/stage4/30-pisdr-leandvb/00-run.sh
+++ b/stage4/30-pisdr-leandvb/00-run.sh
@@ -10,5 +10,6 @@ fi
 
 cd leansdr/src/apps
 make -j$(nproc)
+make install
 ldconfig
 EOF
\ No newline at end of file
diff --git a/stage4/36-pisdr-xwxapt/00-run.sh b/stage4/36-pisdr-xwxapt/00-run.sh
index c45a318..9fd4f5f 100755
--- a/stage4/36-pisdr-xwxapt/00-run.sh
+++ b/stage4/36-pisdr-xwxapt/00-run.sh
@@ -14,6 +14,7 @@ tar jxvf xwxapt-3.4.3.tar.bz2
 cd xwxapt-3.4.3
 ./autogen.sh
 ./configure
-make install -j$(nproc)
+make -j$(nproc)
+make install
 ldconfig
 EOF
\ No newline at end of file
diff --git a/stage4/38-pisdr-wsjtx/00-packages-nr b/stage4/38-pisdr-wsjtx/00-packages-nr
new file mode 100644
index 0000000..c4a5429
--- /dev/null
+++ b/stage4/38-pisdr-wsjtx/00-packages-nr
@@ -0,0 +1 @@
+wsjtx
\ No newline at end of file
diff --git a/stage4/39-pisdr-inspectrum/00-packages-nr b/stage4/39-pisdr-inspectrum/00-packages-nr
new file mode 100644
index 0000000..8594f21
--- /dev/null
+++ b/stage4/39-pisdr-inspectrum/00-packages-nr
@@ -0,0 +1 @@
+libliquid-dev
\ No newline at end of file
diff --git a/stage4/39-pisdr-inspectrum/00-run.sh b/stage4/39-pisdr-inspectrum/00-run.sh
new file mode 100755
index 0000000..c75b015
--- /dev/null
+++ b/stage4/39-pisdr-inspectrum/00-run.sh
@@ -0,0 +1,19 @@
+#!/bin/bash -e
+
+on_chroot << EOF
+mkdir -p    "/home/${FIRST_USER_NAME}/PiSDR/Software"
+cd 		    "/home/${FIRST_USER_NAME}/PiSDR/Software"
+
+if [ ! -d "inspectrum" ]; then
+    git clone --depth 1 https://github.com/miek/inspectrum.git
+fi
+
+cd inspectrum
+mkdir -p build
+cd build
+cmake -GNinja ..
+ninja install
+ldconfig
+cd ..
+rm -fr build
+EOF
\ No newline at end of file
diff --git a/stage4/40-pisdr-rtlais/00-run.sh b/stage4/40-pisdr-rtlais/00-run.sh
new file mode 100755
index 0000000..fb44773
--- /dev/null
+++ b/stage4/40-pisdr-rtlais/00-run.sh
@@ -0,0 +1,15 @@
+#!/bin/bash -e
+
+on_chroot << EOF
+mkdir -p    "/home/${FIRST_USER_NAME}/PiSDR/Software"
+cd 		    "/home/${FIRST_USER_NAME}/PiSDR/Software"
+
+if [ ! -d "rtl-ais" ]; then
+    git clone --depth 1 https://github.com/dgiardini/rtl-ais.git
+fi
+
+cd rtl-ais
+make -j$(nproc)
+make install
+ldconfig
+EOF
\ No newline at end of file
diff --git a/stage4/38-pisdr-cleanup/00-run.sh b/stage4/41-pisdr-cleanup/00-run.sh
similarity index 100%
rename from stage4/38-pisdr-cleanup/00-run.sh
rename to stage4/41-pisdr-cleanup/00-run.sh
diff --git a/stage4/38-pisdr-cleanup/01-run.sh b/stage4/41-pisdr-cleanup/01-run.sh
similarity index 100%
rename from stage4/38-pisdr-cleanup/01-run.sh
rename to stage4/41-pisdr-cleanup/01-run.sh