Fixed data issues