Additional tweaks to auth