Tweaks to Safe Start