Minor changes to the certificate store and parcel_suffix