Fixes to GPR evaluator