Several changes related to synergies