Bug fixes to wallyworld's branch for certs.



(Review request: http://reviews.vapour.ws/r/668/)