Last hacky bug fixes for species stuff.