Auth fixes/improvements