KAZOO-2920 tweaks