diff --git a/code/game/machinery/navbeacon.dm b/code/game/machinery/navbeacon.dm
index 5b6cfb5e73d..3d980e769e7 100644
--- a/code/game/machinery/navbeacon.dm
+++ b/code/game/machinery/navbeacon.dm
@@ -26,11 +26,13 @@
 
 	var/turf/T = loc
 	hide(T.intact)
-	if(codes["patrol"])
+	if(!codes || !codes.len)
+		log_debug("Empty codes datum at ([x],[y],[z])")
+	if("patrol" in codes)
 		if(!navbeacons["[z]"])
 			navbeacons["[z]"] = list()
 		navbeacons["[z]"] += src //Register with the patrol list!
-	if(codes["delivery"])
+	if("delivery" in codes)
 		deliverybeacons += src
 		deliverybeacontags += location
 
@@ -39,6 +41,15 @@
 	deliverybeacons -= src
 	return ..()
 
+/obj/machinery/navbeacon/serialize()
+	var/list/data = ..()
+	data["codes"] = codes
+	return data
+
+/obj/machinery/navbeacon/deserialize(list/data)
+	codes = data["codes"]
+	..()
+
 // set the transponder codes assoc list from codes_txt
 /obj/machinery/navbeacon/proc/set_codes()
 	if(!codes_txt)
@@ -201,4 +212,4 @@ Transponder Codes:<UL>"}
 
 			codes[newkey] = newval
 
-			updateDialog()
\ No newline at end of file
+			updateDialog()
diff --git a/code/modules/awaymissions/maploader/reader.dm b/code/modules/awaymissions/maploader/reader.dm
index 1cd81bd214d..3dc187f388a 100644
--- a/code/modules/awaymissions/maploader/reader.dm
+++ b/code/modules/awaymissions/maploader/reader.dm
@@ -379,8 +379,13 @@ var/global/dmm_suite/preloader/_preloader = new
 			var/trim_right = trim_text(copytext(text,equal_position+1,position))//the content of the variable
 
 			//Check for string
+			// Make it read to the next delimiter, instead of the quote
 			if(findtext(trim_right,quote,1,2))
-				trim_right = copytext(trim_right,2,findtext(trim_right,quote,3,0))
+				log_debug(trim_right)
+				var/endquote = findtext(trim_right,quote,-1)
+				if(!endquote)
+					log_debug("Terminating quote not found!")
+				trim_right = copytext(trim_right,2,endquote)
 
 			//Check for number
 			else if(isnum(text2num(trim_right)))
@@ -402,7 +407,6 @@ var/global/dmm_suite/preloader/_preloader = new
 			else if(ispath(text2path(trim_right)))
 				trim_right = text2path(trim_right)
 
-			log_debug(trim_right)
 			to_return[trim_left] = trim_right
 
 		else//simple var
diff --git a/code/modules/persistence/persistence.dm b/code/modules/persistence/persistence.dm
index 8e05ef2432e..aa2784cd071 100644
--- a/code/modules/persistence/persistence.dm
+++ b/code/modules/persistence/persistence.dm
@@ -22,10 +22,10 @@
 	return
 
 
-/atom/movable
+/atom
 	// This is so specific atoms can override these, and ignore certain ones
 	var/list/vars_to_save = list("dir","name","color","icon","icon_state")
-/atom/movable/serialize()
+/atom/serialize()
 	var/list/data = ..()
 	for(var/thing in vars_to_save)
 		if(vars[thing] != initial(vars[thing]))
@@ -33,7 +33,7 @@
 	return data
 
 
-/atom/movable/deserialize(var/list/data)
+/atom/deserialize(var/list/data)
 	for(var/thing in vars_to_save)
 		if(thing in data)
 			vars[thing] = data[thing]