Fix problems with auth