diff --git a/src/MSICALib.cpp b/src/MSICALib.cpp
index d991645..aad6113 100644
--- a/src/MSICALib.cpp
+++ b/src/MSICALib.cpp
@@ -88,7 +88,7 @@ COpList::COpList(int iTicks) : COperation(iTicks)
 DWORD COpList::LoadFromFile(LPCTSTR pszFileName)
 {
     CStream fSequence(CreateFile(pszFileName, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, NULL));
-    if (!fSequence)
+    if (!fSequence.valid())
         return GetLastError();
 
     // Load operation sequence.
@@ -102,7 +102,7 @@ DWORD COpList::LoadFromFile(LPCTSTR pszFileName)
 DWORD COpList::SaveToFile(LPCTSTR pszFileName) const
 {
     CStream fSequence(CreateFile(pszFileName, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, NULL));
-    if (!fSequence)
+    if (!fSequence.valid())
         return GetLastError();
 
     // Save execute sequence to file.
diff --git a/src/OpTS.cpp b/src/OpTS.cpp
index 0802a52..05a9ab0 100644
--- a/src/OpTS.cpp
+++ b/src/OpTS.cpp
@@ -412,7 +412,7 @@ HRESULT COpTaskCreate::Execute(CSession *pSession)
 
         // Save the task.
         winstd::com_obj<IPersistFile> pTaskFile(pTask);
-        if (!pTaskFile) { hr = E_NOINTERFACE; goto finish; }
+        if (!pTaskFile.valid()) { hr = E_NOINTERFACE; goto finish; }
         hr = pTaskFile->Save(NULL, TRUE);
     }
 
@@ -761,7 +761,7 @@ HRESULT COpTaskDelete::Execute(CSession *pSession)
 
             // Save the backup copy.
             winstd::com_obj<IPersistFile> pTaskFile(pTask);
-            if (!pTaskFile) { hr = E_NOINTERFACE; goto finish; }
+            if (!pTaskFile.valid()) { hr = E_NOINTERFACE; goto finish; }
             hr = pTaskFile->Save(NULL, TRUE);
             if (FAILED(hr)) goto finish;
 
@@ -896,7 +896,7 @@ HRESULT COpTaskEnable::Execute(CSession *pSession)
 
         // Save the task.
         winstd::com_obj<IPersistFile> pTaskFile(pTask);
-        if (!pTaskFile) { hr = E_NOINTERFACE; goto finish; }
+        if (!pTaskFile.valid()) { hr = E_NOINTERFACE; goto finish; }
         hr = pTaskFile->Save(NULL, TRUE);
         if (FAILED(hr)) goto finish;
     }
@@ -975,7 +975,7 @@ HRESULT COpTaskCopy::Execute(CSession *pSession)
             vEmpty,                  // userId
             vEmpty,                  // password
             logonType,               // logonType
-            winstd::variant(sSSDL),      // sddl
+            winstd::variant((BSTR)sSSDL), // sddl
             &pTaskOrig);             // ppTask
         if (FAILED(hr)) goto finish;
     } else {
@@ -1001,7 +1001,7 @@ HRESULT COpTaskCopy::Execute(CSession *pSession)
 
         // Save the task.
         winstd::com_obj<IPersistFile> pTaskFile(pTask);
-        if (!pTaskFile) { hr = E_NOINTERFACE; goto finish; }
+        if (!pTaskFile.valid()) { hr = E_NOINTERFACE; goto finish; }
         hr = pTaskFile->Save(NULL, TRUE);
         if (FAILED(hr)) goto finish;
     }