Fixes to use right attributes for organism type