diff --git a/cs-code/client_menu.qc b/cs-code/client_menu.qc
index 5ed3c85ee..7b3875021 100644
--- a/cs-code/client_menu.qc
+++ b/cs-code/client_menu.qc
@@ -85,7 +85,7 @@ integer save_cursor;
 void () scan_saves =
 {
 	local integer i;
-	local string f;	//FIXME need a file type;
+	local file_t f;
 	for (i = 0; i < MAX_SAVEGAMES; i++) {
 		loadable[i] = 0;
 		filenames[i] = "--- UNUSED SLOT ---";
diff --git a/cs-code/file.h b/cs-code/file.h
index aa08f3d39..517c6402b 100644
--- a/cs-code/file.h
+++ b/cs-code/file.h
@@ -1,9 +1,11 @@
 #ifndef __file_h
 #define __file_h
 
-//FIXME need a proper file struct, string sucks
-@extern string (string path, string mode) File_Open;
-@extern void (string file) File_Close;
-@extern string (string file) File_GetLine;
+struct _file_t = {};
+typedef _file_t [] file_t;
+
+@extern file_t (string path, string mode) File_Open;
+@extern void (file_t file) File_Close;
+@extern string (file_t file) File_GetLine;
 
 #endif//__file_h
diff --git a/cs-code/file.r b/cs-code/file.r
index 84860748b..2b504c51c 100644
--- a/cs-code/file.r
+++ b/cs-code/file.r
@@ -1,6 +1,5 @@
 #include "file.h"
 
-//FIXME need a proper file struct, string sucks
-string (string path, string mode) File_Open = #0;
-void (string file) File_Close = #0;
-string (string file) File_GetLine = #0;
+file_t (string path, string mode) File_Open = #0;
+void (file_t file) File_Close = #0;
+string (file_t file) File_GetLine = #0;
diff --git a/cs-code/object.r b/cs-code/object.r
index dd7dc8c61..47e71d256 100644
--- a/cs-code/object.r
+++ b/cs-code/object.r
@@ -134,7 +134,7 @@ BOOL (id object) object_is_meta_class = #0;
 
 -(BOOL)isEqual:anObject
 {
-	return id(self) == anObject;	//FIXME shouldn't need cast
+	return self == anObject;
 }
 
 -(integer)compare:anotherObject = #0;	// can only == or != pointers