diff --git a/src/c/compiler.d b/src/c/compiler.d
index 5c8000242..d2f633ac8 100644
--- a/src/c/compiler.d
+++ b/src/c/compiler.d
@@ -1767,7 +1767,6 @@ c_tagbody(cl_object args, int flags)
 */
 static int
 c_throw(cl_object stmt, int flags) {
-	/* FIXME! Do we apply the right protocol here? */
 	cl_object tag = pop(&stmt);
 	cl_object form = pop(&stmt);
 	if (stmt != Cnil)
@@ -1841,7 +1840,6 @@ compile_form(cl_object stmt, int flags) {
 	bool push = flags & FLAG_PUSH;
 	int new_flags;
 
-	/* FIXME! We should protect this region with error handling */
  BEGIN:
 	if (code_walker != OBJNULL) {
 		stmt = funcall(3, SYM_VAL(@'si::*code-walker*'), stmt,
diff --git a/src/c/file.d b/src/c/file.d
index 04a5846fe..caf8b7bdd 100644
--- a/src/c/file.d
+++ b/src/c/file.d
@@ -112,6 +112,7 @@ BEGIN:
 		FEtype_error_stream(strm);
 	switch ((enum ecl_smmode)strm->stream.mode) {
 	case smm_input:
+	case smm_probe:
 #if defined(ECL_WSOCK)
 	case smm_input_wsock:
 #endif
@@ -507,9 +508,7 @@ static void flush_output_stream_binary(cl_object strm);
 	case smm_probe:
 		if (fp == NULL)
 			wrong_file_handler(strm);
-		/* FIXME: the check for probe stream is only here because *
-		 *        output_stream_p is not defined for such streams */
-		if (strm->stream.mode != smm_probe && !strm->stream.char_stream_p && ecl_output_stream_p(strm)) {
+		if (!strm->stream.char_stream_p && ecl_output_stream_p(strm)) {
 			if ((strm->stream.byte_size & 7))
 				/* buffered binary output stream -> flush any pending bits */
 				flush_output_stream_binary(strm);