Code generation fixes.