More auth improvements