chg: Some minor changes to certificate creation