Tweaks to embedded new shell loading for framework