Iframe fix

See commit messages for details.