Risk Evaluation Fixes