Fix auth issues