security: Change to use IdentityCertificate instead of Certificate where needed.