KAZOO-1539: minor tweaks