hairy-octo-bugfixes