Several recalculation fixes