Somewhat fixed the auth errors