Minor improvements in evolve