Minor changes to have more correct data