diff --git a/src/V3Ast.cpp b/src/V3Ast.cpp
index 1fd013177..e6c8f81a1 100644
--- a/src/V3Ast.cpp
+++ b/src/V3Ast.cpp
@@ -33,8 +33,8 @@
 //======================================================================
 // Statics
 
-vluint64_t AstNode::s_editCntGbl=0;
 vluint64_t AstNode::s_editCntLast=0;
+vluint64_t AstNode::s_editCntGbl=0;	// Hot cache line
 
 // To allow for fast clearing of all user pointers, we keep a "timestamp"
 // along with each userp, and thus by bumping this count we can make it look
diff --git a/src/V3Ast.h b/src/V3Ast.h
index cdf216828..5c40fe699 100644
--- a/src/V3Ast.h
+++ b/src/V3Ast.h
@@ -730,7 +730,7 @@ public:
     static void	user4ClearTree() { AstUser4InUse::clear(); }
 
     vluint64_t	editCount() const { return m_editCount; }
-    void	editCountInc() { m_editCount = ++s_editCntGbl; }
+    void	editCountInc() { m_editCount = ++s_editCntGbl; }  // Preincrement, so can "watch AstNode::s_editCntGbl=##"
     static vluint64_t	editCountLast() { return s_editCntLast; }
     static vluint64_t	editCountGbl() { return s_editCntGbl; }
     static void		editCountSetLast() { s_editCntLast = editCountGbl(); }
diff --git a/src/V3AstNodes.h b/src/V3AstNodes.h
index fd6f30e9e..68405a6ec 100644
--- a/src/V3AstNodes.h
+++ b/src/V3AstNodes.h
@@ -58,7 +58,7 @@ public:
 	,m_num(V3Number(fl,32,num)) { width(m_num.width(), m_num.sized()?0:m_num.minWidth()); }
     AstConst(FileLine* fl, Unsized32, uint32_t num)  // Unsized 32-bit integer of specified value
 	:AstNodeMath(fl)
-	,m_num(V3Number(fl,32,num)) { m_num.width(32,false); width(32,false); }
+	,m_num(V3Number(fl,32,num)) { m_num.width(32,false); width(32,m_num.minWidth()); }
     ASTNODE_NODE_FUNCS(Const, CONST)
     virtual string name()	const { return num().ascii(); }		// * = Value
     virtual const V3Number& num()	const { return m_num; }		// * = Value