Fix kotlin trait method and cb struct and enum returns

Fix kotlin trait method and cb struct and enum returns #2221