diff --git a/src/Convert/ExprUtils.hs b/src/Convert/ExprUtils.hs
index 69c8c46..6679214 100644
--- a/src/Convert/ExprUtils.hs
+++ b/src/Convert/ExprUtils.hs
@@ -185,6 +185,7 @@ rangeSize (s, e) =
 
 -- returns the size of a range known to be ordered
 rangeSizeHiLo :: Range -> Expr
+rangeSizeHiLo (SizedRange size) = size
 rangeSizeHiLo (hi, lo) =
     simplify $ BinOp Add (BinOp Sub hi lo) (RawNum 1)
 
@@ -206,9 +207,10 @@ endianCondRange r r1 r2 =
 
 -- returns the total size of a set of dimensions
 dimensionsSize :: [Range] -> Expr
+dimensionsSize [] = RawNum 1
 dimensionsSize ranges =
     simplify $
-    foldl (BinOp Mul) (RawNum 1) $
+    foldl1 (BinOp Mul) $
     map rangeSize $
     ranges
 
diff --git a/src/Language/SystemVerilog/AST.hs b/src/Language/SystemVerilog/AST.hs
index 37cbfaa..ae9dbfd 100644
--- a/src/Language/SystemVerilog/AST.hs
+++ b/src/Language/SystemVerilog/AST.hs
@@ -32,6 +32,7 @@ module Language.SystemVerilog.AST
     ) where
 
 import Text.Printf (printf)
+import Data.Bits ((.&.))
 import Data.Hashable (hash)
 
 import Language.SystemVerilog.AST.Attr as Attr
@@ -82,5 +83,5 @@ lhsToExpr (LHSStream o e ls) = Stream o e $ map lhsToExpr ls
 
 shortHash :: (Show a) => a -> String
 shortHash x =
-    take 5 $ printf "%05X" val
+    printf "%05X" $ val .&. 0xFFFFF
     where val = hash $ show x