Tweaks to init