Final changes related to PKI