Few tweaks to config