diff --git a/Makefile b/Makefile
index 40df7cd..eead279 100644
--- a/Makefile
+++ b/Makefile
@@ -137,8 +137,8 @@ installdmr : $(DMRPATH)/DMRGateway $(DMRPATH)/DMRGateway$(MODULE).qn
 	######### DMRGateway #########
 	/bin/ln -f $(DMRPATH)/DMRGateway $(BINDIR)/DMRGateway$(MODULE)
 	/bin/ln -f -s $(shell pwd)/$(DMRPATH)/DMRGateway$(MODULE).qn $(CFGDIR)
-	sed -e "s/XXX/DMRGateway$(MODULE)/" -e "s/YYY/DMRGateway$(MODULE)/" system/dmrgateway.service > $(SYSDIR)/dmrgateway$(MODULE).service
-	/bin/cp -f system/dmrgateway.timer $(SYSDIR)/dmrgateway$(MODULE).timer
+	sed -e "s/XXX/DMRGateway$(MODULE)/" -e "s/YYY/DMRGateway$(MODULE)/" system/mmdvm.service > $(SYSDIR)/dmrgateway$(MODULE).service
+	/bin/cp -f system/gateway.timer $(SYSDIR)/dmrgateway$(MODULE).timer
 	systemctl enable dmrgateway$(MODULE).timer
 	systemctl daemon-reload
 	systemctl start dmrgateway$(MODULE).service
@@ -148,8 +148,8 @@ installysf : $(YSFPATH)/YSFGateway $(YSFPATH)/YSFGateway$(MODULE).qn
 	######### YSFGateway #########
 	/bin/ln -f $(YSFPATH)/YSFGateway $(BINDIR)/YSFGateway$(MODULE)
 	/bin/ln -f -s $(shell pwd)/$(YSFPATH)/YSFGateway$(MODULE).qn $(CFGDIR)
-	sed -e "s/XXX/YSFGateway$(MODULE)/" -e "s/YYY/YSFGateway$(MODULE)/" system/mmdvm.service > $(SYSDIR)/YSFGateway$(MODULE).service
-	/bin/cp -f system/YSFGateway.timer $(SYSDIR)/YSFGateway$(MODULE).timer
+	sed -e "s/XXX/YSFGateway$(MODULE)/" -e "s/YYY/YSFGateway$(MODULE)/" system/mmdvm.service > $(SYSDIR)/ysfgateway$(MODULE).service
+	/bin/cp -f system/gateway.timer $(SYSDIR)/ysfgateway$(MODULE).timer
 	systemctl enable YSFGateway$(MODULE).timer
 	systemctl daemon-reload
 	systemctl start YSFGateway$(MODULE).service
diff --git a/qnadmin b/qnadmin
index 1f4073a..4ac13cb 100755
--- a/qnadmin
+++ b/qnadmin
@@ -23,9 +23,14 @@ ControlC () {
 
 InstallMMDVMHosts () {
 	if [ $nmmdvm -gt 0 ]; then
+		local n
+		if [ -z ${1} ]; then
+			n=$( grep '^processor' /proc/cpuinfo | wc -l )
+			echo "Detected $n processors for make"
+		fi
 		for dir in ../MMDVMHost ../YSFClients ../DMRGateway; do
 			if [ -d $dir ]; then
-				pushd ../$dir
+				pushd $dir
 				make -j$n
 				popd
 			fi
@@ -204,10 +209,10 @@ ModuleStatus () {
 			ModuleProcess[$1]='qnrelay'
 			MMDVMProcess[$1]='mmdvm'
 			MMDVMState[$1]='not installed'
-			DMRProcess[$i]='dmrgateway'
-			DRMState[$i]='not installed'
-			YSFProcess[$i]='ysfgateway'
-			YSFState[$i]='not installed'
+			DMRProcess[$1]='dmrgateway'
+			DRMState[$1]='not installed'
+			YSFProcess[$1]='ysfgateway'
+			YSFState[$1]='not installed'
 		elif [[ "${ModuleProcess[$1]}" == 'qnmmdvmmodem' ]]; then
 			ModuleProcess[$1]='qnmodem'
 		fi
@@ -580,7 +585,6 @@ MaintenanceMenu () {
 				sudo systemctl start ${MMDVMProcess[2]}
 			fi
 			ModuleStatus 2 c $module_c
-		fi
 		elif [[ "$ans" == u* ]] && [ -n $module_a ]; then
 			if [[ "${DMRState[0]}" == 'running' ]]; then
 				sudo systemctl stop ${DMRProcess[0]}
@@ -602,7 +606,6 @@ MaintenanceMenu () {
 				sudo systemctl start ${DMRProcess[2]}
 			fi
 			ModuleStatus 2 c $module_c
-		fi
 		elif [[ "$ans" == x* ]] && [ -n $module_a ]; then
 			if [[ "${YSFState[0]}" == 'running' ]]; then
 				sudo systemctl stop ${YSFProcess[0]}
diff --git a/system/gateway.timer b/system/gateway.timer
new file mode 100644
index 0000000..35781a8
--- /dev/null
+++ b/system/gateway.timer
@@ -0,0 +1,5 @@
+[Timer]
+OnStartupSec=45
+
+[Install]
+WantedBy=multi-user.target
diff --git a/system/mmdvm.service b/system/mmdvm.service
index 75294d2..ffa4e52 100644
--- a/system/mmdvm.service
+++ b/system/mmdvm.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=MMDVMHost
+Description=XXX
 After=systemd-user-session.service qnrelay.service
 
 [Service]