Companion bugfixes