certificate fixes