More fixes to Award/FP scenarios.