Auth fixes
Improvements