More auth hook fixes