KAZOO-2142: Fixes from Pull request review