Tweaks to setup database