Fixes from master, language/species adjustment.