More authN fixes