Code Generation Fixes.