Changed how cert_loc is handled