Mediator tweaks for Shortbus