diff --git a/BUGS b/BUGS
index 6cc24344caa55a08de7150b35945a536accf0c5a..12f245a73ce53000c92662ee2b69adef563b67ac 100644
--- a/BUGS
+++ b/BUGS
@@ -11,9 +11,8 @@ proc.c:
 
 	factor out switching and scheduling code from process code
 
-trap.c
-	if spin locks are ever held without cli,
-	trap should call yield() only if nlock == 0
+kalloc.c
+	more cleanups
 
 ide.c: synchronous disk write -> polling disk write.  search for
        (a)synchronous; xv6 doesn't have asynchronous writes.
@@ -32,3 +31,9 @@ sysfile.c:
 general:
 	sizeof parens?
 
+usertests.c:
+	check for rm of . or ..
+
+L=$HOME/mit/l
+(for i in *.c; do xoc -x xgnu -x ./nodecleq.zeta --typesonly $i; done) 2>&1 | grep warning
+
diff --git a/trap.c b/trap.c
index ed66e99d768de164e3411c108f94d76ed31d3778..1faa49e1d2e708569e7c614cea4995c7d8f19c0c 100644
--- a/trap.c
+++ b/trap.c
@@ -57,6 +57,7 @@ trap(struct trapframe *tf)
         proc_exit();
 
       // Force process to give up CPU and let others run.
+      // If locks were held with interrupts on, would need to check nlock.
       if(cp->state == RUNNING)
         yield();
     }