Fix errors issued from the entities architecture previous modification