Fixes and generation.