For improved compatibility with 'strange' certificates, add some