Fix Authentication issues