Fixes for certs