Some tweaks to auth setup