Fix models for exporting delegates