Fix some conflicts on multimedia patch