Data issues fixed