Changes for auth
Fixes based on code review