Tweaks to autorun