diff --git a/docs/guide/control.rst b/docs/guide/control.rst
index f6d73e453..90f8a5786 100644
--- a/docs/guide/control.rst
+++ b/docs/guide/control.rst
@@ -267,12 +267,15 @@ The grammar of control commands is as follows:
 .. option:: public [-module "<modulename>"] [-task/-function "<taskname>"] [-var "<signame>"]
 
 .. option:: public_flat -path "<hier.path.signame>"
+
 .. option:: public_flat [-module "<modulename>"] [-task/-function "<taskname>"] [(-param | -port | -var) "<signame>"]
 
 .. option:: public_flat_rd -path "<hier.path.signame>"
+
 .. option:: public_flat_rd [-module "<modulename>"] [-task/-function "<taskname>"] [(-param | -port | -var) "<signame>"]
 
 .. option:: public_flat_rw -path "<hier.path.signame>"
+
 .. option:: public_flat_rw [-module "<modulename>"] [-task/-function "<taskname>"] [(-param | -port | -var) "<signame>"] ["@(edge)"]
 
    Sets the specified signal to be public. Same as
diff --git a/src/V3Control.cpp b/src/V3Control.cpp
index 66b63631b..59d6c5ac5 100644
--- a/src/V3Control.cpp
+++ b/src/V3Control.cpp
@@ -1352,12 +1352,10 @@ static void collectScopeMatches(AstNode* firstp, const std::string& name,
     }
 }
 
-using ScopeChildrenCache
-    = std::map<std::pair<const AstNode*, std::string>, std::vector<AstNode*>>;
+using ScopeChildrenCache = std::map<std::pair<const AstNode*, std::string>, std::vector<AstNode*>>;
 
-static const std::vector<AstNode*>& findScopeChildren(AstNode* scopep,
-                                                      const V3ControlHierSegment& seg,
-                                                      ScopeChildrenCache& cache) {
+static const std::vector<AstNode*>&
+findScopeChildren(AstNode* scopep, const V3ControlHierSegment& seg, ScopeChildrenCache& cache) {
     const std::string name = segmentPrettyText(seg);
     const auto key = std::make_pair(static_cast<const AstNode*>(scopep), name);
     const auto pair = cache.emplace(key, std::vector<AstNode*>{});
diff --git a/src/V3Param.cpp b/src/V3Param.cpp
index bdc8832aa..631dd01c2 100644
--- a/src/V3Param.cpp
+++ b/src/V3Param.cpp
@@ -50,8 +50,8 @@
 #include "V3Param.h"
 
 #include "V3Case.h"
-#include "V3Control.h"
 #include "V3Const.h"
+#include "V3Control.h"
 #include "V3EmitV.h"
 #include "V3Hasher.h"
 #include "V3LinkDotIfaceCapture.h"
diff --git a/test_regress/t/t_vlt_public_spec_hier_attr_bad.py b/test_regress/t/t_vlt_public_spec_hier_attr_bad.py
index 5bbab92af..8f28bd8e3 100755
--- a/test_regress/t/t_vlt_public_spec_hier_attr_bad.py
+++ b/test_regress/t/t_vlt_public_spec_hier_attr_bad.py
@@ -12,7 +12,8 @@ import vltest_bootstrap
 test.scenarios('vlt')
 test.top_filename = "t/t_vlt_public_spec.v"
 
-test.lint(fails=True, expect_filename=test.golden_filename,
+test.lint(fails=True,
+          expect_filename=test.golden_filename,
           verilator_flags2=["--vpi", test.name + ".vlt"])
 
 test.passes()
diff --git a/test_regress/t/t_vlt_public_spec_hier_bad.py b/test_regress/t/t_vlt_public_spec_hier_bad.py
index 5bbab92af..8f28bd8e3 100755
--- a/test_regress/t/t_vlt_public_spec_hier_bad.py
+++ b/test_regress/t/t_vlt_public_spec_hier_bad.py
@@ -12,7 +12,8 @@ import vltest_bootstrap
 test.scenarios('vlt')
 test.top_filename = "t/t_vlt_public_spec.v"
 
-test.lint(fails=True, expect_filename=test.golden_filename,
+test.lint(fails=True,
+          expect_filename=test.golden_filename,
           verilator_flags2=["--vpi", test.name + ".vlt"])
 
 test.passes()
diff --git a/test_regress/t/t_vlt_public_spec_hier_cellarr_share.py b/test_regress/t/t_vlt_public_spec_hier_cellarr_share.py
old mode 100644
new mode 100755
diff --git a/test_regress/t/t_vlt_public_spec_hier_escid_array.py b/test_regress/t/t_vlt_public_spec_hier_escid_array.py
old mode 100644
new mode 100755
diff --git a/test_regress/t/t_vlt_public_spec_hier_genblock_bad.py b/test_regress/t/t_vlt_public_spec_hier_genblock_bad.py
index b5d8ba2d4..7a670fcd5 100755
--- a/test_regress/t/t_vlt_public_spec_hier_genblock_bad.py
+++ b/test_regress/t/t_vlt_public_spec_hier_genblock_bad.py
@@ -12,7 +12,8 @@ import vltest_bootstrap
 test.scenarios('vlt')
 test.top_filename = "t/t_vlt_public_spec_hier_genblock.v"
 
-test.lint(fails=True, expect_filename=test.golden_filename,
+test.lint(fails=True,
+          expect_filename=test.golden_filename,
           verilator_flags2=["--vpi", test.name + ".vlt"])
 
 test.passes()
diff --git a/test_regress/t/t_vlt_public_spec_hier_iface.py b/test_regress/t/t_vlt_public_spec_hier_iface.py
old mode 100644
new mode 100755
diff --git a/test_regress/t/t_vlt_public_spec_hier_multidim.py b/test_regress/t/t_vlt_public_spec_hier_multidim.py
old mode 100644
new mode 100755
diff --git a/test_regress/t/t_vlt_public_spec_hier_negidx.py b/test_regress/t/t_vlt_public_spec_hier_negidx.py
old mode 100644
new mode 100755
diff --git a/test_regress/t/t_vlt_public_spec_hier_pubflags.py b/test_regress/t/t_vlt_public_spec_hier_pubflags.py
index 966a970ba..c706c994f 100755
--- a/test_regress/t/t_vlt_public_spec_hier_pubflags.py
+++ b/test_regress/t/t_vlt_public_spec_hier_pubflags.py
@@ -13,8 +13,7 @@ test.scenarios('vlt')
 test.top_filename = "t/t_vlt_public_spec_hier_pub.v"
 
 test.compile(verilator_flags2=[
-    "--binary", "--vpi", "--public-ignore", "--public-params",
-    test.name + ".vlt"
+    "--binary", "--vpi", "--public-ignore", "--public-params", test.name + ".vlt"
 ])
 
 test.execute()
diff --git a/test_regress/t/t_vlt_public_spec_hier_share.py b/test_regress/t/t_vlt_public_spec_hier_share.py
old mode 100644
new mode 100755