still need X47 fixes for certs