Even more authentication fixes