KAZOO-2870: pull request tweaks