diff --git a/.gitignore b/.gitignore
index 0bd013576..0e9b76aa1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,6 +23,7 @@ dddrun*
 doxygen-doc
 gdbrun*
 gmon.out
+ncverilog.history
 internals.txt
 verilator.txt
 verilator_bin*
diff --git a/Changes b/Changes
index e7a40b7a0..2930465c2 100644
--- a/Changes
+++ b/Changes
@@ -13,7 +13,7 @@ The contributors that suggested a given feature are shown in []. Thanks!
 ****  Fix internals to avoid 'using namespace std'.
 
 
-* Verilator 3.921 devel
+* Verilator 3.922 2018-03-17
 
 **    Support IEEE 1800-2017 as default language.
 
diff --git a/MANIFEST.SKIP b/MANIFEST.SKIP
index 43b95e7f3..4e602ed87 100644
--- a/MANIFEST.SKIP
+++ b/MANIFEST.SKIP
@@ -34,6 +34,7 @@ verilator.pc$
 verilator_bin.*
 verilator_coverage_bin.*
 .vcsmx_rebuild$
+ncverilog.history
 autom4te\.cache/
 nodist/
 /simv$
diff --git a/src/V3Inst.cpp b/src/V3Inst.cpp
index de6ec807f..f58e7a0dc 100644
--- a/src/V3Inst.cpp
+++ b/src/V3Inst.cpp
@@ -49,8 +49,7 @@ private:
     AstUser1InUse	m_inuser1;
 
     // STATE
-    AstNodeModule*	m_modp;		// Current module
-    AstCell*	m_cellp;	// Current cell
+    AstCell*            m_cellp;        // Current cell
 
     static int debug() {
 	static int level = -1;
@@ -60,13 +59,6 @@ private:
     //int m_debug;  int debug() { return m_debug; }
 
     // VISITORS
-    virtual void visit(AstNodeModule* nodep) {
-	UINFO(4," MOD   "<<nodep<<endl);
-	//if (nodep->name() == "t_chg") m_debug = 9; else m_debug=0;
-	m_modp = nodep;
-	nodep->iterateChildren(*this);
-	m_modp = NULL;
-    }
     virtual void visit(AstCell* nodep) {
 	UINFO(4,"  CELL   "<<nodep<<endl);
 	m_cellp = nodep;
@@ -96,7 +88,7 @@ private:
 	    } else if (nodep->modVarp()->isOutput()) {
 		AstNode* rhsp = new AstVarXRef (exprp->fileline(), nodep->modVarp(), m_cellp->name(), false);
 		AstAssignW* assp = new AstAssignW (exprp->fileline(), exprp, rhsp);
-		m_modp->addStmtp(assp);
+                m_cellp->addNextHere(assp);
 	    } else if (nodep->modVarp()->isInput()) {
 		// Don't bother moving constants now,
 		// we'll be pushing the const down to the cell soon enough.
@@ -104,7 +96,7 @@ private:
 		    (exprp->fileline(),
 		     new AstVarXRef(exprp->fileline(), nodep->modVarp(), m_cellp->name(), true),
 		     exprp);
-		m_modp->addStmtp(assp);
+                m_cellp->addNextHere(assp);
 		if (debug()>=9) assp->dumpTree(cout,"     _new: ");
 	    } else if (nodep->modVarp()->isIfaceRef()
                        || (VN_IS(nodep->modVarp()->subDTypep(), UnpackArrayDType)
@@ -115,7 +107,7 @@ private:
                 const AstVarXRef* xrefp = VN_CAST(exprp, VarXRef);
 		if (!refp && !xrefp) exprp->v3fatalSrc("Interfaces: Pin is not connected to a VarRef or VarXRef");
 		AstAssignVarScope* assp = new AstAssignVarScope(exprp->fileline(), lhsp, exprp);
-		m_modp->addStmtp(assp);
+                m_cellp->addNextHere(assp);
 	    } else {
 		nodep->v3error("Assigned pin is neither input nor output");
 	    }
@@ -145,7 +137,6 @@ private:
 public:
     // CONSTUCTORS
     explicit InstVisitor(AstNetlist* nodep) {
-	m_modp=NULL;
 	m_cellp=NULL;
 	//
 	nodep->accept(*this);
diff --git a/src/V3Scope.cpp b/src/V3Scope.cpp
index 7b9902cb0..87381fa4f 100644
--- a/src/V3Scope.cpp
+++ b/src/V3Scope.cpp
@@ -53,8 +53,9 @@ private:
 
     // TYPES
     typedef vl_unordered_map<AstPackage*, AstScope*> PackageScopeMap;
-    typedef vl_unordered_map<std::pair<AstVar*, AstScope*>, AstVarScope*> VarScopeMap;
-    typedef vl_unordered_set<std::pair<AstVarRef*, AstScope*> > VarRefScopeSet;
+    // These cannot be unordered unless make a specialized hashing pair (gcc-8)
+    typedef std::map<std::pair<AstVar*, AstScope*>, AstVarScope*> VarScopeMap;
+    typedef std::set<std::pair<AstVarRef*, AstScope*> > VarRefScopeSet;
 
     // STATE, inside processing a single module
     AstNodeModule* m_modp;	// Current module
diff --git a/test_regress/driver.pl b/test_regress/driver.pl
index 61242fb1f..d05c6aa96 100755
--- a/test_regress/driver.pl
+++ b/test_regress/driver.pl
@@ -978,7 +978,12 @@ sub _run {
     flush STDERR;
 
     if (!$param{fails} && $status) {
-	$self->error("Exec of $param{cmd}[0] failed\n");
+        my $firstline = "";
+        if (my $fh = IO::File->new("<$param{logfile}")) {
+            $firstline = $fh->getline;
+            chomp $firstline;
+        }
+        $self->error("Exec of $param{cmd}[0] failed: $firstline\n");
     }
     if ($param{fails} && $status) {
 	print "(Exec expected to fail, and did.)\n";
diff --git a/test_regress/t/t_preproc_persist.pl b/test_regress/t/t_preproc_persist.pl
index 2127bc3e9..87fc25f66 100755
--- a/test_regress/t/t_preproc_persist.pl
+++ b/test_regress/t/t_preproc_persist.pl
@@ -15,7 +15,7 @@ compile (
     # Override default flags
     v_flags => [''],
     v_other_filenames => ["t_preproc_persist2.v"],
-    verilator_flags => ["-E -P +incdir+t"],
+    verilator_flags => ["-E -P +incdir+t -Mdir $Self->{obj_dir}", ],
     verilator_flags2 => ['',],
     verilator_flags3 => ['',],
     verilator_make_gcc => 0,
diff --git a/test_regress/t/t_preproc_ttempty.pl b/test_regress/t/t_preproc_ttempty.pl
index 8279fbdd1..c76f0a87a 100755
--- a/test_regress/t/t_preproc_ttempty.pl
+++ b/test_regress/t/t_preproc_ttempty.pl
@@ -14,7 +14,7 @@ my $stdout_filename = "$Self->{obj_dir}/$Self->{name}__test.vpp";
 compile (
     # Override default flags
     v_flags => [''],
-    verilator_flags => ["-E -P +incdir+t"],
+    verilator_flags => ["-E -P +incdir+t -Mdir $Self->{obj_dir}", ],
     verilator_flags2 => ['',],
     verilator_flags3 => ['',],
     verilator_make_gcc => 0,