Some auth fixes