[#3028] Fixes to base media backwards comp.