Few tweaks to get ready for iframe isolation.