media fixes etc