Story 49233287: Fixed up some issues with System risk tree