Tortoise small bugfixes

Needed for climate change