More auth related changes.