Fix adaptive data issues