Fix regeneration issues