Fixed math calcs