Fix tables and some formulas