Bug fixes to wallyworld's branch for certs.