Some more fixes to the Iframe issue