Fix media retrievers