Fix a few more issues, incl bad merge in ssl-observatory.js.