diff --git a/ruamoko/cl_menu/Makefile.am b/ruamoko/cl_menu/Makefile.am
index 8654f1f4b..ac1447403 100644
--- a/ruamoko/cl_menu/Makefile.am
+++ b/ruamoko/cl_menu/Makefile.am
@@ -1,8 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 AUTOMAKE_OPTIONS= foreign
 
-#FIXME should qf data be installed somewhere other than id1 that gets
-#searched after everything else?
 pkgdatadir=@sharepath@/QF
 
 QFCC_DEP=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT)
diff --git a/ruamoko/include/Object.h b/ruamoko/include/Object.h
index ba85b6b5b..9572ae6a3 100644
--- a/ruamoko/include/Object.h
+++ b/ruamoko/include/Object.h
@@ -62,7 +62,7 @@ typedef enum {
 @extern BOOL (id object) object_is_instance;
 @extern BOOL (id object) object_is_meta_class;
 
-@protocol Object // FIXME -- qfcc doesn't like calling this protocol "Object"!
+@protocol Object
 - (Class) class;
 - (Class) superclass;
 - (BOOL) isEqual: (id)anObject;
diff --git a/ruamoko/lib/AutoreleasePool.r b/ruamoko/lib/AutoreleasePool.r
index 4df2b33cb..c5c2e51f4 100644
--- a/ruamoko/lib/AutoreleasePool.r
+++ b/ruamoko/lib/AutoreleasePool.r
@@ -48,10 +48,10 @@
 	local integer	i;
 	local id		tmp;
 
-	for (i = 0; i < ((AutoreleasePool) self).count; i++)
-		[((AutoreleasePool) self).array[i] release];	// FIXME
+	for (i = 0; i < count; i++)
+		[array[i] release];
 
-	obj_free (((AutoreleasePool) self).array);	// FIXME
+	obj_free (array);
 
 	/*
 		This may be wrong.
diff --git a/ruamoko/lib/ListNode.r b/ruamoko/lib/ListNode.r
index 19e9cd459..c72dbef2b 100644
--- a/ruamoko/lib/ListNode.r
+++ b/ruamoko/lib/ListNode.r
@@ -49,7 +49,7 @@
 
 - (void) dealloc
 {
-	[((ListNode) self).data release]; // FIXME -- acrobatics shouldn't be needed
+	[data release];
 	[super dealloc];
 }