Some changes for MediaCrush