KAZOO-2158: Fixes