First cut at fixing the gen of the api