Fixed up callout generation