KAZOO-1771: Corrections