Authenication fixes