Fix kotlin trait method and cb struct and enum returns (#705)

Fix kotlin trait method and cb struct and enum returns (#705) #2222