diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a2eb3b5d..d325fef9 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -81,5 +81,5 @@ jobs:
         run: |
           temp=$(mktemp -d)
           wget -P $temp "https://github.com/Matts966/zetasql-formatter/releases/download/${TAG}/zetasql-formatter_linux_x86_64.zip"
-          sudo unzip $temp/zetasql-formatter_darwin_amd64.zip -d /usr/local/bin
+          sudo unzip $temp/zetasql-formatter_linux_x86_64.zip -d /usr/local/bin
           zetasql-formatter .
diff --git a/zetasql/parser/unparser.cc b/zetasql/parser/unparser.cc
index 71eb1b8e..ebf23965 100644
--- a/zetasql/parser/unparser.cc
+++ b/zetasql/parser/unparser.cc
@@ -1737,6 +1737,7 @@ void Unparser::visitASTClampedBetweenModifier(
   println();
   {
     Formatter::Indenter indenter(&formatter_);
+    println();
     print("CLAMPED BETWEEN");
     for (int i = 0; i < node->num_children(); i++) {
       PrintCommentsPassedBy(node->child(i)->GetParseLocationRange().start(), data);
@@ -2323,6 +2324,7 @@ void Unparser::visitASTBetweenExpression(const ASTBetweenExpression* node,
   node->child(0)->Accept(this, data);
   {
     Formatter::Indenter indenter(&formatter_);
+    println();
     print(absl::StrCat(node->is_not() ? "NOT " : "", "BETWEEN"));
     for (int i = 1; i < node->num_children(); i++) {
       PrintCommentsPassedBy(node->child(i)->GetParseLocationRange().start(), data);
@@ -2686,6 +2688,7 @@ void Unparser::visitASTWindowFrame(const ASTWindowFrame* node,
   print(node->GetFrameUnitString());
   if (nullptr != node->end_expr()) {
     Formatter::Indenter indenter(&formatter_);
+    println();
     print("BETWEEN");
     node->start_expr()->Accept(this, data);
     println();