KAZOO-2136 tweaks
KAZOO-2136 more tweaks