Toot updates

Fixes #1064.