AuthN fixes