Species and organ fixes.

Dupliate of #7518. Git diff being bad.