Fix issues with media set improvements