Fix a couple of evaluations