Iframe embedded fixes