fixes to kafka