Auth minor improvements