certool fixes