Fix mediamanager