diff --git a/units/fedora/halt.service b/units/fedora/halt.service
index acc47b503dd..06c588fae60 100644
--- a/units/fedora/halt.service
+++ b/units/fedora/halt.service
@@ -22,6 +22,7 @@ After=shutdown.target killall.service
 
 [Service]
 Type=finish
+ValidNoProcess=yes
 Environment=INIT_HALT=HALT
 Environment=RUNLEVEL=0
 ExecStart=/etc/init.d/halt start
diff --git a/units/fedora/killall.service b/units/fedora/killall.service
index 45868dd1733..13bb564ad5d 100644
--- a/units/fedora/killall.service
+++ b/units/fedora/killall.service
@@ -20,4 +20,5 @@ Description=Kill All Processes
 
 [Service]
 Type=finish
+ValidNoProcess=yes
 ExecStart=/etc/init.d/killall start
diff --git a/units/fedora/poweroff.service b/units/fedora/poweroff.service
index 758b7ca237a..a8cd68062fb 100644
--- a/units/fedora/poweroff.service
+++ b/units/fedora/poweroff.service
@@ -22,5 +22,6 @@ After=shutdown.target killall.service
 
 [Service]
 Type=finish
+ValidNoProcess=yes
 Environment=RUNLEVEL=0
 ExecStart=/etc/init.d/halt start
diff --git a/units/fedora/rc-local.service b/units/fedora/rc-local.service
index 099bbabcd60..e8284a183af 100644
--- a/units/fedora/rc-local.service
+++ b/units/fedora/rc-local.service
@@ -26,4 +26,7 @@ Names=rc-local.service local.service
 [Service]
 ExecStart=/etc/rc.local start
 Type=simple
+TimeoutSec=0
+StandardInput=tty
+ValidNoProcess=yes
 SysVStartPriority=99
diff --git a/units/fedora/reboot.service b/units/fedora/reboot.service
index 9aec7aaac68..da83fa067cf 100644
--- a/units/fedora/reboot.service
+++ b/units/fedora/reboot.service
@@ -22,5 +22,6 @@ After=shutdown.target killall.service
 
 [Service]
 Type=finish
+ValidNoProcess=yes
 Environment=RUNLEVEL=6
 ExecStart=/etc/init.d/reboot start
diff --git a/units/fedora/sysinit.service b/units/fedora/sysinit.service
index 0d59490f90d..f2098fd799a 100644
--- a/units/fedora/sysinit.service
+++ b/units/fedora/sysinit.service
@@ -21,4 +21,7 @@ Before=local-fs.target remote-fs.target swap.target sockets.target
 
 [Service]
 ExecStart=/etc/rc.d/rc.sysinit
-Type=finish
+Type=forking
+TimeoutSec=0
+StandardInput=tty
+ValidNoProcess=yes
diff --git a/units/getty@.service.m4 b/units/getty@.service.m4
index 9787638de04..ffcc42aad95 100644
--- a/units/getty@.service.m4
+++ b/units/getty@.service.m4
@@ -27,3 +27,5 @@ After=basic.target
 [Service]
 Type=simple
 ExecStart=GETTY %I
+Restart=restart-always
+RestartSec=0