Changed some stuff related to certs