1) Authentication fixes
2) Endpoints fixes