Fix Some data issues