More NEAT bug fixes.