Fixing more calculations