Tweaks to Safe Start
Merge pull request #118 from ferstaberinde/dev

v3-0-8 (even more)