KAZOO-3064 fixes
some changes