Minor updates to Certificate