Trying to fix auth issues