Fixed some data migration