Try to fix some data inconsistancies