KAFKA-901: Follow up minor changes