diff --git a/.github/actions/setup-build-env/action.yml b/.github/actions/setup-build-env/action.yml
index f9d06f719..e6e8a46f9 100644
--- a/.github/actions/setup-build-env/action.yml
+++ b/.github/actions/setup-build-env/action.yml
@@ -35,14 +35,14 @@ runs:
       if: runner.os == 'Linux'
       uses: awalsh128/cache-apt-pkgs-action@v1.6.0
       with:
-        packages: gawk git make python3 bison clang flex libffi-dev libfl-dev libreadline-dev pkg-config tcl-dev zlib1g-dev libnsl-dev libdwarf-dev libelf-dev elfutils libdw-dev ccache
+        packages: gawk git make python3 bison clang flex libffi-dev libfl-dev libeditreadline-dev pkg-config tcl-dev zlib1g-dev libnsl-dev libdwarf-dev libelf-dev elfutils libdw-dev ccache
         version: ${{ inputs.runs-on }}-commonys
 
     - name: Linux build dependencies
       if: runner.os == 'Linux' && inputs.get-build-deps == 'true'
       uses: awalsh128/cache-apt-pkgs-action@v1.6.0
       with:
-        packages: gawk git make python3 bison clang flex libffi-dev libfl-dev libreadline-dev pkg-config tcl-dev zlib1g-dev libnsl-dev libdwarf-dev libelf-dev elfutils libdw-dev ccache libgtest-dev libgmock-dev
+        packages: gawk git make python3 bison clang flex libffi-dev libfl-dev libeditreadline-dev pkg-config tcl-dev zlib1g-dev libnsl-dev libdwarf-dev libelf-dev elfutils libdw-dev ccache libgtest-dev libgmock-dev
         version: ${{ inputs.runs-on }}-buildys
 
     - name: Linux docs dependencies
diff --git a/kernel/newcelltypes.h b/kernel/newcelltypes.h
index eb42019af..2ddb63e00 100644
--- a/kernel/newcelltypes.h
+++ b/kernel/newcelltypes.h
@@ -91,6 +91,7 @@ struct CellTableBuilder {
 		setup_type(ID($scopeinfo), {}, {}, features);
 		setup_type(ID($input_port), {}, {ID::Y}, features);
 		setup_type(ID($connect), {ID::A, ID::B}, {}, features);
+		setup_type(ID($icg), {ID::CLK, ID::EN, ID::SE}, {ID::GCLK}, features);
 	}
 	constexpr void setup_internals_eval()
 	{
diff --git a/silimate-shell.nix b/silimate-shell.nix
index fc368e136..746035ff6 100644
--- a/silimate-shell.nix
+++ b/silimate-shell.nix
@@ -45,6 +45,7 @@ pkgs.mkShell {
 		gtkwave # vcd2fst
 		(python3.withPackages(ps: with ps; [pybind11 cxxheaderparser]))
 		gnu-ar
+		gtest
 	] ++ lib.optionals stdenv.isLinux [
 		elfutils # provides libdw.so (not to be confused with libdwarf.so)
 	];