Do not require certificate to be installed, and fix a few bugs