fixes for kafka driver