Configuration tweaks
Tweaks to config