diff --git a/Source/com/Administrator.h b/Source/com/Administrator.h
index 5f01a6b70..c279b2eb0 100644
--- a/Source/com/Administrator.h
+++ b/Source/com/Administrator.h
@@ -452,7 +452,7 @@ namespace RPC {
         InvokeServer& operator=(InvokeServer&&) = delete;
         InvokeServer& operator=(const InvokeServer&) = delete;
 
-        InvokeServer(Core::IWorkerPool* workers)
+        explicit InvokeServer(Core::IWorkerPool* workers)
             : _threadPoolEngine(*workers)
         {
             ASSERT(workers != nullptr);
diff --git a/Source/core/Proxy.h b/Source/core/Proxy.h
index be89eb3ff..f54c89d3c 100644
--- a/Source/core/Proxy.h
+++ b/Source/core/Proxy.h
@@ -525,7 +525,6 @@ POP_WARNING()
             {
                 return (_refCount == a_RHS._refCount);
             }
-
             inline bool operator!=(const ProxyType<CONTEXT>& a_RHS) const
             {
                 return !(operator==(a_RHS));
@@ -534,11 +533,18 @@ POP_WARNING()
             {
                 return ((_refCount != nullptr) && (_realObject == &a_RHS));
             }
-
             inline bool operator!=(const CONTEXT& a_RHS) const
             {
                 return (!operator==(a_RHS));
             }
+            inline bool operator==(const nullptr_t&) const
+            {
+                return (_refCount == nullptr);
+            }
+            inline bool operator!=(const nullptr_t&) const
+            {
+                return (_refCount != nullptr);
+            }
 
             inline CONTEXT* operator->() const
             {