Improve certificates