Generated interface fixes