Minor tweaks to settings, dependecies