More certificate mangling