Auth fixes and improvement