diff --git a/code/modules/ambient_occlusion/ao_turf.dm b/code/modules/ambient_occlusion/ao_turf.dm
index 3c36245f1f6..c6b1e7daf2f 100644
--- a/code/modules/ambient_occlusion/ao_turf.dm
+++ b/code/modules/ambient_occlusion/ao_turf.dm
@@ -1,7 +1,7 @@
 #ifdef AO_USE_LIGHTING_OPACITY
-#define AO_TURF_CHECK(T) (!T.has_opaque_atom)
+#define AO_TURF_CHECK(T) (!T.has_opaque_atom || !T.permit_ao)
 #else
-#define AO_TURF_CHECK(T) (!T.density || !T.opacity)
+#define AO_TURF_CHECK(T) (!T.density || !T.opacity || !T.permit_ao)
 #endif
 
 /turf
diff --git a/code/modules/client/preference_setup/global/02_settings.dm b/code/modules/client/preference_setup/global/02_settings.dm
index 1f7568e1c8d..71ad90270f1 100644
--- a/code/modules/client/preference_setup/global/02_settings.dm
+++ b/code/modules/client/preference_setup/global/02_settings.dm
@@ -31,7 +31,9 @@
 				"toggles",
 				"asfx_togs",
 				"lastmotd" = "motd_hash",
-				"lastmemo" = "memo_hash"
+				"lastmemo" = "memo_hash",
+				"parallax_toggles" = "parallax_togs",
+				"parallax_speed"
 			), 
 			"args" = list("ckey")
 		)
diff --git a/html/changelogs/lohikar-fixes.yml b/html/changelogs/lohikar-fixes.yml
new file mode 100644
index 00000000000..28ef224e7e0
--- /dev/null
+++ b/html/changelogs/lohikar-fixes.yml
@@ -0,0 +1,5 @@
+author: Lohikar
+delete-after: True
+changes: 
+  - bugfix: "Parallax preferences now actually get loaded, because apparently that's important or something."
+  - bugfix: "Shuttles should now longer get mysterious square shadows."