Minor upgrades to the composition