Kafka/Toward minor trivial

Yozef.k