Minor cert generation fixes