Fixed some NEAT issues