Fixed some classed in data package