Fixed some formulas