KAZOO-1513: tweaks