Various updates for new damage scaling