Bug fixes in claiming animals