diff --git a/c/addfeatures/hotconv/BASE.cpp b/c/addfeatures/hotconv/BASE.cpp
index 36d36a4c6..a05e4d312 100644
--- a/c/addfeatures/hotconv/BASE.cpp
+++ b/c/addfeatures/hotconv/BASE.cpp
@@ -10,6 +10,8 @@
 #include <stdlib.h>
 #include <stdio.h>
 
+#include <algorithm>
+
 void BASENew(hotCtx g) {
     g->ctx.BASEp = new BASE(g);
 }
@@ -69,7 +71,6 @@ Offset BASE::fillSharedData() {
         bvSize += bv.size();
 
         baseValues.emplace_back(std::move(bv));
-
     }
 
     /* Adjust BaseValue coord offsets */
diff --git a/c/addfeatures/hotconv/BASE.h b/c/addfeatures/hotconv/BASE.h
index 28089033d..73426ddc4 100644
--- a/c/addfeatures/hotconv/BASE.h
+++ b/c/addfeatures/hotconv/BASE.h
@@ -5,6 +5,9 @@
 #ifndef ADDFEATURES_HOTCONV_BASE_H_
 #define ADDFEATURES_HOTCONV_BASE_H_
 
+#include <utility>
+#include <vector>
+
 #include "common.h"
 
 #define BASE_ TAG('B', 'A', 'S', 'E')
@@ -26,7 +29,7 @@ class BASE {
             }
             Tag baseScriptTag {0};
             int16_t baseScriptInx {0};
-            int32_t baseScriptOffset {0} ; // |-> BaseScriptList
+            int32_t baseScriptOffset {0};  // |-> BaseScriptList
                                            // long instead of Offset for temp -ve value
         };
 
@@ -41,7 +44,7 @@ class BASE {
         void prep(hotCtx g);
         Offset fill(Offset curr);
         void write(Offset shared, BASE *h);
-    
+
         std::vector<Tag> baseTagList;
         Offset baseTagOffset {0};
         std::vector<BaseScriptRecord> baseScriptList;
@@ -110,6 +113,7 @@ class BASE {
     int Fill();
     void Write();
     void setAxisCount(uint16_t axisCount) { ivs.setAxisCount(axisCount); }
+
  private:
     int addBaseScript(int dfltInx, size_t nBaseTags, std::vector<VarValueRecord> &coords);
     static Offset hdr_size(bool seenVariable) {
diff --git a/docs/OpenTypeFeatureFileSpecification.md b/docs/OpenTypeFeatureFileSpecification.md
index 3210e579d..5f5b8cd3f 100644
--- a/docs/OpenTypeFeatureFileSpecification.md
+++ b/docs/OpenTypeFeatureFileSpecification.md
@@ -3322,7 +3322,7 @@ A `<script record>` is of the form:
 
 ```fea
 # Format A
-<number>
+<(v)number>
 
 # Format B
 <number> <glyph> <number>
@@ -3331,6 +3331,9 @@ A `<script record>` is of the form:
 <number> <device>
 ```
 
+For a variable font, the number in format A can either be plain or be a
+variable value specified according to value record format B.
+
 The baseline tags for each `BaseTagList` must be sorted in increasing ASCII
 order.