Calculation tweaks