Minor tweaks and config changes