Formula fixes