diff --git a/fbxa/editor.r b/fbxa/editor.r
index 94e9a86..e7edc00 100644
--- a/fbxa/editor.r
+++ b/fbxa/editor.r
@@ -3,6 +3,7 @@
 #include "string.h"
 #include "PropertyList.h"
 #include "qfile.h"
+#include "qfs.h"
 #include "editor.h"
 
 @interface TeleportMenu: ImpulseValueMenu
@@ -753,7 +754,7 @@
 	local QFile file;
 	local PLItem plist;
 
-	file = Qopen ("temp.way", "wt");
+	file = QFS_Open ("temp.way", "wt");
 	if (!file) {
 		sprint (@self, PRINT_HIGH, "cound not create file temp.way\n");
 		return self;
diff --git a/fbxa/waypoint.r b/fbxa/waypoint.r
index 38dc857..81094c7 100644
--- a/fbxa/waypoint.r
+++ b/fbxa/waypoint.r
@@ -338,6 +338,7 @@ Waypoint Loading from file
 		else
 			[l addObject:[PLItem newString:"0"]];
 	}
+	[way addKey:"link" value:l];
 	[way addKey:"flags" value:[PLItem newString:itos (flags)]];
 	[list addObject:way];
 }
@@ -345,8 +346,9 @@ Waypoint Loading from file
 +(PLItem) plist
 {
 	local PLItem list = [PLItem newArray];
-	[waypoint_array makeObjectsPerformSelector:@selector(plitem)
+	[waypoint_array makeObjectsPerformSelector:@selector(plitem:)
 					withObject:list];
+	return list;
 }
 
 -(void) checkWay:(Target)ent