Tweaks to setup the app