Fixes for media controller.