Various tweaks to paths and config settings