Fixed the fields of a few entities