It's not always necessary to specify it is a 'custom' certificate. Also some other minor improvements.