Some more tweaks related to certificates.