Fixed data bugs