diff --git a/clash-ghc.cabal b/clash-ghc.cabal
--- a/clash-ghc.cabal
+++ b/clash-ghc.cabal
@@ -1,11 +1,11 @@
 Name:                 clash-ghc
-Version:              0.3
+Version:              0.3.0.1
 Synopsis:             CAES Language for Synchronous Hardware
 Description:
   CλaSH (pronounced ‘clash’) is a functional hardware description language that
   borrows both its syntax and semantics from the functional programming language
   Haskell. The merits of using a functional language to describe hardware comes
-  from the fact that combinational circuits can be directly modeled as
+  from the fact that combinational circuits can be directly modelled as
   mathematical functions and that functional languages lend themselves very well
   at describing and (de-)composing mathematical functions.
   .
@@ -30,9 +30,8 @@
                       src-bin/PosixSource.h
 
 Data-files:           primitives/clash.bit.json,
-                      primitives/clash.ghc.ghc2core.json,
                       primitives/clash.prelude.json,
-                      primitives/clash.prelude.explicit.json,
+                      primitives/clash.prelude.explicit.json
                       primitives/clash.promoted.nat.json,
                       primitives/clash.signal.explicit.json,
                       primitives/clash.signal.implicit.json,
diff --git a/primitives/clash.ghc.ghc2core.json b/primitives/clash.ghc.ghc2core.json
deleted file mode 100644
--- a/primitives/clash.ghc.ghc2core.json
+++ /dev/null
@@ -1,6 +0,0 @@
-[ { "BlackBox" :
-    { "name"      : "EmptyCase"
-    , "templateE" : "~DEFAULTO"
-    }
-  }
-]
diff --git a/primitives/clash.sized.vector.json b/primitives/clash.sized.vector.json
--- a/primitives/clash.sized.vector.json
+++ b/primitives/clash.sized.vector.json
@@ -49,13 +49,13 @@
   signal ~SYM[1] : ~TYP[1];
 begin
   ~SYM[1] <= ~ARG[1];
-  ~RESULT <= ~ARG[0] & ~SYM[1](~SYM[1]'high downto 1);
+  ~RESULT <= ~TYPM[0]'(~ARG[0]) & ~SYM[1](~SYM[1]'high downto 1);
 end block;"
     }
   }
 , { "BlackBox" :
     { "name"      : "CLaSH.Sized.Vector.snoc"
-    , "templateE" : "~ARG[1] & ~ARG[0]"
+    , "templateE" : "~TYPM[1]'(~ARG[1]) & ~TYPM[0]'(~ARG[0])"
     }
   }
 , { "BlackBox" :
@@ -65,13 +65,13 @@
   signal ~SYM[1] : ~TYP[1];
 begin
   ~SYM[1] <= ~ARG[1];
-  ~RESULT <= ~SYM[1]((~SYM[1]'high)-1 downto 0) & ~ARG[0];
+  ~RESULT <= ~SYM[1]((~SYM[1]'high)-1 downto 0) & ~TYPM[0]'(~ARG[0]);
 end block;"
     }
   }
 , { "BlackBox" :
     { "name"      : "CLaSH.Sized.Vector.vappend"
-    , "templateE" : "~ARG[0] & ~ARG[1]"
+    , "templateE" : "~TYPM[0]'(~ARG[0]) & ~TYPM[1]'(~ARG[1])"
     }
   }
 , { "BlackBox" :