Fixed auth stuff