Tweaks to fetching remote scriptlets