diff --git a/src/V3LifePost.cpp b/src/V3LifePost.cpp
index 10c69396c..c5e37af8a 100644
--- a/src/V3LifePost.cpp
+++ b/src/V3LifePost.cpp
@@ -110,7 +110,7 @@ class LifePostDlyVisitor : public LifePostBaseVisitor {
 private:
     // NODE STATE
     // Cleared on entire tree
-    //  AstVarScope::user()	-> Sequence # of first virtex setting this var.
+    //  AstVarScope::user()     -> Sequence # of first vertex setting this var.
     //  AstVarScope::user2()	-> Sequence # of last consumption of this var
     //  AstVarScope::user4()	-> AstVarScope*: Passed to LifePostElim to substitute this var
     AstUser1InUse	m_inuser1;
diff --git a/src/V3String.cpp b/src/V3String.cpp
index 4562ca9f8..ab06bc4d5 100644
--- a/src/V3String.cpp
+++ b/src/V3String.cpp
@@ -220,7 +220,8 @@ uint64_t VHashSha1::digestUInt64() {
     const string& binhash = digestBinary();
     uint64_t out = 0;
     for (size_t byte=0; byte<sizeof(uint64_t); ++byte) {
-	out = (out<<8) | binhash[byte];
+        unsigned char c = binhash[byte];
+        out = (out<<8) | c;
     }
     return out;
 }
diff --git a/test_regress/t/t_sys_sformat_noopt.pl b/test_regress/t/t_sys_sformat_noopt.pl
index 1d8758351..c6d831138 100755
--- a/test_regress/t/t_sys_sformat_noopt.pl
+++ b/test_regress/t/t_sys_sformat_noopt.pl
@@ -14,7 +14,8 @@ compile (
     verilator_flags2 => ["-O0"],
     );
 
-if ($Self->cxx_version =~ /clang version 3.8/) {
+if ($Self->cxx_version =~ /clang version ([0-9]+\.[0-9]+)/
+    && ($1 >= 3.8 && $1 <= 5.0)) {
     $Self->skip("Known clang bug");
     #Here:   if (VL_UNLIKELY(VL_NEQ_W(12, __Vtemp1, vlSymsp->TOP__t.__PVT__str)))
 } else{