More auth touchup