Tweaks to new media modal support