Fix weird data errors