diff --git a/world/s6-scripts/etc/s6/rc/compiled/db b/world/s6-scripts/etc/s6/rc/compiled/db
index 7b7af86..2ecca25 100644
Binary files a/world/s6-scripts/etc/s6/rc/compiled/db and b/world/s6-scripts/etc/s6/rc/compiled/db differ
diff --git a/world/s6-scripts/etc/s6/rc/compiled/n b/world/s6-scripts/etc/s6/rc/compiled/n
index a4b0ca2..bc4fb64 100644
Binary files a/world/s6-scripts/etc/s6/rc/compiled/n and b/world/s6-scripts/etc/s6/rc/compiled/n differ
diff --git a/world/s6-scripts/etc/s6/rc/compiled/resolve.cdb b/world/s6-scripts/etc/s6/rc/compiled/resolve.cdb
index b508ebc..ce72e61 100644
Binary files a/world/s6-scripts/etc/s6/rc/compiled/resolve.cdb and b/world/s6-scripts/etc/s6/rc/compiled/resolve.cdb differ
diff --git a/world/s6-scripts/etc/s6/rc/compiled/servicedirs/getty-tty1/run b/world/s6-scripts/etc/s6/rc/compiled/servicedirs/getty-tty1/run
index ea05427..90794cc 100755
--- a/world/s6-scripts/etc/s6/rc/compiled/servicedirs/getty-tty1/run
+++ b/world/s6-scripts/etc/s6/rc/compiled/servicedirs/getty-tty1/run
@@ -2,4 +2,4 @@
 if { pipeline { redirfd -w 2 /dev/null s6-rc -a list } grep -qFx mount-filesystems }
 envfile /etc/s6/sv/getty-tty1/conf
 importas -iu SPAWN SPAWN
-exec getty tty1
+exec getty /dev/tty1
diff --git a/world/s6-scripts/etc/s6/rc/compiled/servicedirs/getty-tty2/run b/world/s6-scripts/etc/s6/rc/compiled/servicedirs/getty-tty2/run
index 9440f9e..4225e0d 100755
--- a/world/s6-scripts/etc/s6/rc/compiled/servicedirs/getty-tty2/run
+++ b/world/s6-scripts/etc/s6/rc/compiled/servicedirs/getty-tty2/run
@@ -2,4 +2,4 @@
 if { pipeline { redirfd -w 2 /dev/null s6-rc -a list } grep -qFx mount-filesystems }
 envfile /etc/s6/sv/getty-tty2/conf
 importas -iu SPAWN SPAWN
-exec getty tty2
+exec getty /dev/tty2
diff --git a/world/s6-scripts/etc/s6/rc/compiled/servicedirs/getty-tty3/run b/world/s6-scripts/etc/s6/rc/compiled/servicedirs/getty-tty3/run
index 5e3e34d..df6ae6a 100755
--- a/world/s6-scripts/etc/s6/rc/compiled/servicedirs/getty-tty3/run
+++ b/world/s6-scripts/etc/s6/rc/compiled/servicedirs/getty-tty3/run
@@ -2,4 +2,4 @@
 if { pipeline { redirfd -w 2 /dev/null s6-rc -a list } grep -qFx mount-filesystems }
 envfile /etc/s6/sv/getty-tty3/conf
 importas -iu SPAWN SPAWN
-exec getty tty3
+exec getty /dev/tty3
diff --git a/world/s6-scripts/etc/s6/rc/compiled/servicedirs/getty-tty4/run b/world/s6-scripts/etc/s6/rc/compiled/servicedirs/getty-tty4/run
index bbf7528..bbee62b 100755
--- a/world/s6-scripts/etc/s6/rc/compiled/servicedirs/getty-tty4/run
+++ b/world/s6-scripts/etc/s6/rc/compiled/servicedirs/getty-tty4/run
@@ -2,4 +2,4 @@
 if { pipeline { redirfd -w 2 /dev/null s6-rc -a list } grep -qFx mount-filesystems }
 envfile /etc/s6/sv/getty-tty4/conf
 importas -iu SPAWN SPAWN
-exec getty tty4
+exec getty /dev/tty4
diff --git a/world/s6-scripts/etc/s6/rc/compiled/servicedirs/getty-tty5/run b/world/s6-scripts/etc/s6/rc/compiled/servicedirs/getty-tty5/run
index b0e6162..2a3ccc8 100755
--- a/world/s6-scripts/etc/s6/rc/compiled/servicedirs/getty-tty5/run
+++ b/world/s6-scripts/etc/s6/rc/compiled/servicedirs/getty-tty5/run
@@ -1,5 +1,5 @@
 #!/bin/execlineb -P
 if { pipeline { redirfd -w 2 /dev/null s6-rc -a list } grep -qFx mount-filesystems }
-envfile /etc/s6/sv/agetty-tty5/conf
+envfile /etc/s6/sv/getty-tty5/conf
 importas -iu SPAWN SPAWN
-exec getty tty5
+exec getty /dev/tty5
diff --git a/world/s6-scripts/etc/s6/rc/compiled/servicedirs/getty-tty6/run b/world/s6-scripts/etc/s6/rc/compiled/servicedirs/getty-tty6/run
index c39498c..6a84480 100755
--- a/world/s6-scripts/etc/s6/rc/compiled/servicedirs/getty-tty6/run
+++ b/world/s6-scripts/etc/s6/rc/compiled/servicedirs/getty-tty6/run
@@ -1,5 +1,5 @@
 #!/bin/execlineb -P
 if { pipeline { redirfd -w 2 /dev/null s6-rc -a list } grep -qFx mount-filesystems }
-envfile /etc/s6/sv/agetty-tty6/conf
+envfile /etc/s6/sv/getty-tty6/conf
 importas -iu SPAWN SPAWN
-exec getty tty6
+exec getty /dev/tty6
diff --git a/world/s6-scripts/etc/s6/sv/getty-tty1/run b/world/s6-scripts/etc/s6/sv/getty-tty1/run
index ea05427..90794cc 100644
--- a/world/s6-scripts/etc/s6/sv/getty-tty1/run
+++ b/world/s6-scripts/etc/s6/sv/getty-tty1/run
@@ -2,4 +2,4 @@
 if { pipeline { redirfd -w 2 /dev/null s6-rc -a list } grep -qFx mount-filesystems }
 envfile /etc/s6/sv/getty-tty1/conf
 importas -iu SPAWN SPAWN
-exec getty tty1
+exec getty /dev/tty1
diff --git a/world/s6-scripts/etc/s6/sv/getty-tty2/run b/world/s6-scripts/etc/s6/sv/getty-tty2/run
index 9440f9e..4225e0d 100644
--- a/world/s6-scripts/etc/s6/sv/getty-tty2/run
+++ b/world/s6-scripts/etc/s6/sv/getty-tty2/run
@@ -2,4 +2,4 @@
 if { pipeline { redirfd -w 2 /dev/null s6-rc -a list } grep -qFx mount-filesystems }
 envfile /etc/s6/sv/getty-tty2/conf
 importas -iu SPAWN SPAWN
-exec getty tty2
+exec getty /dev/tty2
diff --git a/world/s6-scripts/etc/s6/sv/getty-tty3/run b/world/s6-scripts/etc/s6/sv/getty-tty3/run
index 5e3e34d..df6ae6a 100644
--- a/world/s6-scripts/etc/s6/sv/getty-tty3/run
+++ b/world/s6-scripts/etc/s6/sv/getty-tty3/run
@@ -2,4 +2,4 @@
 if { pipeline { redirfd -w 2 /dev/null s6-rc -a list } grep -qFx mount-filesystems }
 envfile /etc/s6/sv/getty-tty3/conf
 importas -iu SPAWN SPAWN
-exec getty tty3
+exec getty /dev/tty3
diff --git a/world/s6-scripts/etc/s6/sv/getty-tty4/run b/world/s6-scripts/etc/s6/sv/getty-tty4/run
index bbf7528..bbee62b 100644
--- a/world/s6-scripts/etc/s6/sv/getty-tty4/run
+++ b/world/s6-scripts/etc/s6/sv/getty-tty4/run
@@ -2,4 +2,4 @@
 if { pipeline { redirfd -w 2 /dev/null s6-rc -a list } grep -qFx mount-filesystems }
 envfile /etc/s6/sv/getty-tty4/conf
 importas -iu SPAWN SPAWN
-exec getty tty4
+exec getty /dev/tty4
diff --git a/world/s6-scripts/etc/s6/sv/getty-tty5/run b/world/s6-scripts/etc/s6/sv/getty-tty5/run
index b0e6162..2a3ccc8 100644
--- a/world/s6-scripts/etc/s6/sv/getty-tty5/run
+++ b/world/s6-scripts/etc/s6/sv/getty-tty5/run
@@ -1,5 +1,5 @@
 #!/bin/execlineb -P
 if { pipeline { redirfd -w 2 /dev/null s6-rc -a list } grep -qFx mount-filesystems }
-envfile /etc/s6/sv/agetty-tty5/conf
+envfile /etc/s6/sv/getty-tty5/conf
 importas -iu SPAWN SPAWN
-exec getty tty5
+exec getty /dev/tty5
diff --git a/world/s6-scripts/etc/s6/sv/getty-tty6/run b/world/s6-scripts/etc/s6/sv/getty-tty6/run
index c39498c..6a84480 100644
--- a/world/s6-scripts/etc/s6/sv/getty-tty6/run
+++ b/world/s6-scripts/etc/s6/sv/getty-tty6/run
@@ -1,5 +1,5 @@
 #!/bin/execlineb -P
 if { pipeline { redirfd -w 2 /dev/null s6-rc -a list } grep -qFx mount-filesystems }
-envfile /etc/s6/sv/agetty-tty6/conf
+envfile /etc/s6/sv/getty-tty6/conf
 importas -iu SPAWN SPAWN
-exec getty tty6
+exec getty /dev/tty6
diff --git a/world/s6-scripts/etc/s6/sv/misc/contents b/world/s6-scripts/etc/s6/sv/misc/contents
index f537c20..795f013 100644
--- a/world/s6-scripts/etc/s6/sv/misc/contents
+++ b/world/s6-scripts/etc/s6/sv/misc/contents
@@ -1,6 +1,5 @@
 hostname
 hwclock
-modules
 kmod-static-nodes
 tmpfiles-dev
 rc-local
diff --git a/world/s6-scripts/etc/s6/sv/mount-filesystems/up b/world/s6-scripts/etc/s6/sv/mount-filesystems/up
index 5e481a3..17691f1 100644
--- a/world/s6-scripts/etc/s6/sv/mount-filesystems/up
+++ b/world/s6-scripts/etc/s6/sv/mount-filesystems/up
@@ -1,3 +1,3 @@
 #!/bin/execlineb -P
-foreground { mount -a -t nonfs,nocifs }
+foreground { mount -a -o no_netdev }
 foreground { if { test -x /usr/bin/zfs } zfs mount -a }
diff --git a/world/s6-scripts/etc/s6/sv/mount-net/up b/world/s6-scripts/etc/s6/sv/mount-net/up
index 3270c08..b132835 100644
--- a/world/s6-scripts/etc/s6/sv/mount-net/up
+++ b/world/s6-scripts/etc/s6/sv/mount-net/up
@@ -1,2 +1,2 @@
 #!/bin/execlineb -P
-exec mount -a -t nfs,cifs
+exec mount -a -o netdev
diff --git a/world/s6-scripts/etc/s6/sv/setup/contents b/world/s6-scripts/etc/s6/sv/setup/contents
index d9c7230..58de758 100644
--- a/world/s6-scripts/etc/s6/sv/setup/contents
+++ b/world/s6-scripts/etc/s6/sv/setup/contents
@@ -4,7 +4,6 @@ getty
 net-lo
 swap
 random-seed
-tmpfiles-setup
 dmesg
 sysctl
 binfmt
diff --git a/world/s6-scripts/etc/s6/sv/sysuser/timeout-down b/world/s6-scripts/etc/s6/sv/sysuser/timeout-down
deleted file mode 100644
index 573541a..0000000
--- a/world/s6-scripts/etc/s6/sv/sysuser/timeout-down
+++ /dev/null
@@ -1 +0,0 @@
-0