Fixed evolution bugs