diff --git a/indra/copy_win_scripts/start-client.py b/indra/copy_win_scripts/start-client.py
index 6ce0314d249e2d5a2f1b0df0b3002e02cc535b45..f3579a1e71c6af3ffc245a4aed717dc8b65dd983 100755
--- a/indra/copy_win_scripts/start-client.py
+++ b/indra/copy_win_scripts/start-client.py
@@ -63,7 +63,7 @@ def start_client(grid, slurl, build_config, my_args):
 if __name__ == "__main__":
     grid = llstart.get_config("grid")
     
-    if grid == None:
+    if grid is None:
         grid = "aditi"
         
     build_config = llstart.get_config("build_config")
@@ -81,7 +81,7 @@ def start_client(grid, slurl, build_config, my_args):
             sys.exit(0)
             
     slurl = llstart.get_config("slurl")            
-    if slurl == None:
+    if slurl is None:
         if region is None:
             region = llstart.get_user_name()
         slurl = "//%s/128/128/" % (region)
diff --git a/indra/lib/python/indra/util/llmanifest.py b/indra/lib/python/indra/util/llmanifest.py
index 39d3a9fc465cecddedb06c762d7e86623d89efdd..c5c2b132feac744abeec2d6c860fd3d32ab50e43 100755
--- a/indra/lib/python/indra/util/llmanifest.py
+++ b/indra/lib/python/indra/util/llmanifest.py
@@ -570,7 +570,7 @@ def put_in_file(self, contents, dst, src=None):
         return dst_path
 
     def replace_in(self, src, dst=None, searchdict={}):
-        if dst == None:
+        if dst is None:
             dst = src
         # read src
         with open(self.src_path_of(src), 'r', encoding='utf-8') as f:
@@ -837,9 +837,9 @@ def path2basename(self, path, file):
 
     def path(self, src, dst=None, err_if_missing=True):
         sys.stdout.flush()
-        if src == None:
+        if src is None:
             raise ManifestError("No source file, dst is " + dst)
-        if dst == None:
+        if dst is None:
             dst = src
         dst = os.path.join(self.get_dst_prefix(), dst)
         sys.stdout.write("Processing %s => %s ... " % (src, self._relative_dst_path(dst)))
@@ -891,7 +891,7 @@ def path_optional(self, src, dst=None):
         or a list containing dst (present). Concatenate these
         return values to get a list of all libs that are present.
         """
-        if dst == None:
+        if dst is None:
             dst = src
 
         # This was simple before we started needing to pass