Fixing auth issues...