Eval and fix comparison bugs