Fix cds build