Fix a few MediaReference TODOs