Fixing data issues