Tweaks to startup code