diff --git a/flang/runtime/connection.h b/flang/runtime/connection.h
--- a/flang/runtime/connection.h
+++ b/flang/runtime/connection.h
@@ -40,7 +40,7 @@
   // Positions in a record file (sequential or direct, not stream)
   std::int64_t currentRecordNumber{1}; // 1 is first
   std::int64_t positionInRecord{0}; // offset in current record
-  std::int64_t furthestPositionInRecord{0}; // max(positionInRecord)
+  std::int64_t furthestPositionInRecord{0}; // max(position+bytes)
   bool nonAdvancing{false}; // ADVANCE='NO'
 
   // Set at end of non-advancing I/O data transfer
diff --git a/flang/runtime/format-implementation.h b/flang/runtime/format-implementation.h
--- a/flang/runtime/format-implementation.h
+++ b/flang/runtime/format-implementation.h
@@ -225,14 +225,14 @@
   while (true) {
     std::optional<int> repeat;
     bool unlimited{false};
-    CharType ch{Capitalize(GetNextChar(context))};
+    CharType ch{GetNextChar(context)};
     while (ch == ',' || ch == ':') {
       // Skip commas, and don't complain if they're missing; the format
       // validator does that.
       if (stop && ch == ':') {
         return 0;
       }
-      ch = Capitalize(GetNextChar(context));
+      ch = GetNextChar(context);
     }
     if (ch == '-' || ch == '+' || (ch >= '0' && ch <= '9')) {
       repeat = GetIntField(context, ch);
@@ -246,6 +246,7 @@
         return 0;
       }
     }
+    ch = Capitalize(ch);
     if (ch == '(') {
       if (height_ >= maxHeight_) {
         context.SignalError(IostatErrorInFormat,
diff --git a/flang/runtime/stop.cpp b/flang/runtime/stop.cpp
--- a/flang/runtime/stop.cpp
+++ b/flang/runtime/stop.cpp
@@ -42,8 +42,14 @@
   }
 }
 
+static void CloseAllExternalUnits(const char *why) {
+  Fortran::runtime::io::IoErrorHandler handler{why};
+  Fortran::runtime::io::ExternalFileUnit::CloseAll(handler);
+}
+
 [[noreturn]] void RTNAME(StopStatement)(
     int code, bool isErrorStop, bool quiet) {
+  CloseAllExternalUnits("STOP statement");
   if (!quiet) {
     if (code != EXIT_SUCCESS) {
       std::fprintf(stderr, "Fortran %s: code %d\n",
@@ -56,6 +62,7 @@
 
 [[noreturn]] void RTNAME(StopStatementText)(
     const char *code, bool isErrorStop, bool quiet) {
+  CloseAllExternalUnits("STOP statement");
   if (!quiet) {
     std::fprintf(
         stderr, "Fortran %s: %s\n", isErrorStop ? "ERROR STOP" : "STOP", code);
@@ -66,12 +73,12 @@
 
 [[noreturn]] void RTNAME(FailImageStatement)() {
   Fortran::runtime::NotifyOtherImagesOfFailImageStatement();
+  CloseAllExternalUnits("FAIL IMAGE statement");
   std::exit(EXIT_FAILURE);
 }
 
 [[noreturn]] void RTNAME(ProgramEndStatement)() {
-  Fortran::runtime::io::IoErrorHandler handler{"END statement"};
-  Fortran::runtime::io::ExternalFileUnit::CloseAll(handler);
+  CloseAllExternalUnits("END statement");
   std::exit(EXIT_SUCCESS);
 }
 }
diff --git a/flang/runtime/unit.cpp b/flang/runtime/unit.cpp
--- a/flang/runtime/unit.cpp
+++ b/flang/runtime/unit.cpp
@@ -129,6 +129,10 @@
     return false;
   }
   WriteFrame(frameOffsetInFile_, recordOffsetInFrame_ + furthestAfter, handler);
+  if (positionInRecord > furthestPositionInRecord) {
+    std::memset(Frame() + furthestPositionInRecord, ' ',
+        positionInRecord - furthestPositionInRecord);
+  }
   std::memcpy(Frame() + positionInRecord, data, bytes);
   positionInRecord += bytes;
   furthestPositionInRecord = furthestAfter;
@@ -189,7 +193,7 @@
             ' ', *recordLength - furthestPositionInRecord);
       }
     } else {
-      positionInRecord = furthestPositionInRecord + 1;
+      positionInRecord = furthestPositionInRecord;
       ok &= Emit("\n", 1, handler); // TODO: Windows CR+LF
       frameOffsetInFile_ += recordOffsetInFrame_ + furthestPositionInRecord;
       recordOffsetInFrame_ = 0;