Some media manager fixes