Regenerate | fix stubs