Performance fixes communication