diff --git a/src/github.com/matrix-org/dendrite/clientapi/readers/directory.go b/src/github.com/matrix-org/dendrite/clientapi/readers/directory.go
index a27729e9d..db8e75247 100644
--- a/src/github.com/matrix-org/dendrite/clientapi/readers/directory.go
+++ b/src/github.com/matrix-org/dendrite/clientapi/readers/directory.go
@@ -44,7 +44,7 @@ func DirectoryRoom(
 	}
 
 	if domain == cfg.Matrix.ServerName {
-		// TODO: Implement joining local room aliases.
+		// TODO: Implement lookup up local room aliases.
 		panic(fmt.Errorf("Looking up local room aliases is not implemented"))
 	} else {
 		resp, err := federation.LookupRoomAlias(domain, roomAlias)
@@ -58,6 +58,8 @@ func DirectoryRoom(
 					}
 				}
 			}
+			// TODO: Return 502 if the remote server errored.
+			// TODO: Return 504 if the remote server timed out.
 			return httputil.LogThenError(req, err)
 		}
 
diff --git a/src/github.com/matrix-org/dendrite/clientapi/routing/routing.go b/src/github.com/matrix-org/dendrite/clientapi/routing/routing.go
index 17b2ba46b..ce895c4bc 100644
--- a/src/github.com/matrix-org/dendrite/clientapi/routing/routing.go
+++ b/src/github.com/matrix-org/dendrite/clientapi/routing/routing.go
@@ -107,7 +107,6 @@ func Setup(
 
 	r0mux.Handle("/directory/room/{roomAlias}",
 		common.MakeAuthAPI("directory_room", deviceDB, func(req *http.Request, device *authtypes.Device) util.JSONResponse {
-			// TODO: Return the result of looking up the room in the room directory
 			vars := mux.Vars(req)
 			return readers.DirectoryRoom(req, device, vars["roomAlias"], federation, &cfg)
 		}),