several fixes for the kerberos integration