Fix issue with DPSScore calculation
Fix DH discipline calculation