Fixed #1481. More Mediator schema fixes.