Some tweaks to config