diff --git a/kernel/celltypes.h b/kernel/celltypes.h
index 3535542b1..c7126dfca 100644
--- a/kernel/celltypes.h
+++ b/kernel/celltypes.h
@@ -93,12 +93,12 @@ struct CellTypes
 			setup_module(module);
 	}
 
-	void setup_internals()         { enabled_cats |= BIT_INTERNALS_OTHER | BIT_INTERNALS_EVAL | BIT_INTERNALS_FF | BIT_INTERNALS_ANYINIT | BIT_INTERNALS_MEM; }
+	void setup_internals()         { enabled_cats |= BIT_INTERNALS_OTHER | BIT_INTERNALS_EVAL; }
 	void setup_internals_eval()    { enabled_cats |= BIT_INTERNALS_EVAL; }
 	void setup_internals_ff()      { enabled_cats |= BIT_INTERNALS_FF; }
 	void setup_internals_anyinit() { enabled_cats |= BIT_INTERNALS_ANYINIT; }
 	void setup_internals_mem()     { enabled_cats |= BIT_INTERNALS_FF | BIT_INTERNALS_MEM; }
-	void setup_stdcells()          { enabled_cats |= BIT_STDCELLS_EVAL | BIT_STDCELLS_TRISTATE | BIT_STDCELLS_FF; }
+	void setup_stdcells()          { enabled_cats |= BIT_STDCELLS_EVAL | BIT_STDCELLS_TRISTATE; }
 	void setup_stdcells_eval()     { enabled_cats |= BIT_STDCELLS_EVAL; }
 	void setup_stdcells_mem()      { enabled_cats |= BIT_STDCELLS_FF; }
 
diff --git a/misc/gen_celltypes.py b/misc/gen_celltypes.py
index 1ac03c055..aefff07e1 100644
--- a/misc/gen_celltypes.py
+++ b/misc/gen_celltypes.py
@@ -10,7 +10,7 @@ import re
 import sys
 from dataclasses import dataclass
 
-MAX_CELLS = 300
+MAX_CELLS = 1024
 MAX_PORTS = 20
 
 # Build the IdString index map
@@ -51,7 +51,7 @@ class Features:
 @dataclass
 class CellInfo:
     type_name: str
-    inputs: list
+    inputs: MAX_CELLS
     outputs: list
     features: Features