diff --git a/src/c/file.d b/src/c/file.d
index cbedb4b7c..961841ef2 100755
--- a/src/c/file.d
+++ b/src/c/file.d
@@ -3099,7 +3099,9 @@ set_stream_elt_type(cl_object stream, cl_fixnum byte_size, int flags,
     flags &= ~ECL_STREAM_SIGNED_BYTES;
     t = @'unsigned-byte';
   }
-  flags = parse_external_format(stream, external_format, flags);
+  if (external_format != ECL_NIL) {
+    flags = parse_external_format(stream, external_format, flags);
+  }
   stream->stream.ops->read_char = eformat_read_char;
   stream->stream.ops->write_char = eformat_write_char;
   switch (flags & ECL_STREAM_FORMAT) {
@@ -3264,12 +3266,10 @@ si_stream_external_format_set(cl_object stream, cl_object format)
 #endif
     {
       cl_object elt_type = ecl_stream_element_type(stream);
-      unlikely_if (elt_type != @'character' &&
-                   elt_type != @'base-char')
-        FEerror("Cannot change external format"
-                "of binary stream ~A", 1, stream);
-      set_stream_elt_type(stream, stream->stream.byte_size,
-                          stream->stream.flags, format);
+      unlikely_if (elt_type != @'character' && elt_type != @'base-char') {
+        FEerror("Cannot change external format of binary stream ~A", 1, stream);
+      }
+      set_stream_elt_type(stream, stream->stream.byte_size, stream->stream.flags, format);
     }
     break;
   default:
diff --git a/src/lsp/process.lsp b/src/lsp/process.lsp
index 5f47676f5..5240e5673 100644
--- a/src/lsp/process.lsp
+++ b/src/lsp/process.lsp
@@ -209,8 +209,8 @@
         (when piped-pairs
           #+threads
           (let ((thread (external-process-%pipe process)))
-              (mp:process-preset thread #'pipe-streams process piped-pairs)
-              (mp:process-enable thread))
+            (mp:process-preset thread #'pipe-streams process piped-pairs)
+            (mp:process-enable thread))
           #-threads
           (if wait
               (pipe-streams process piped-pairs)