Changes for kerberos