Tweaks to default setup