Tweaks to init script