Fixes calculations for kitten upgrades