Fixed some evolution bugs