Fixes to single species