Fixes to setup and iframing