fixes in mediator section