Fixing bugs since removing authService