diff --git a/fdroidserver/stats.py b/fdroidserver/stats.py
index ea5b4f84..eb118409 100644
--- a/fdroidserver/stats.py
+++ b/fdroidserver/stats.py
@@ -100,9 +100,9 @@ def main():
             sys.exit(1)
         finally:
             #Disconnect
-            if ftp != None:
+            if ftp is not None:
                 ftp.close()
-            if ssh != None:
+            if ssh is not None:
                 ssh.close()
 
     # Process logs
diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index c2007166..a14489ef 100644
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -458,7 +458,7 @@ def make_index(apps, apks, repodir, archive, categories):
         repoel.setAttribute("url", repo_url)
         addElement('description', repo_description, doc, repoel)
 
-    if repo_keyalias != None:
+    if repo_keyalias is not None:
 
         # Generate a certificate fingerprint the same way keytool does it
         # (but with slightly different formatting)
@@ -532,13 +532,13 @@ def make_index(apps, apks, repodir, archive, categories):
         addElement('web', app['Web Site'], doc, apel)
         addElement('source', app['Source Code'], doc, apel)
         addElement('tracker', app['Issue Tracker'], doc, apel)
-        if app['Donate'] != None:
+        if app['Donate'] is not None:
             addElement('donate', app['Donate'], doc, apel)
-        if app['Bitcoin'] != None:
+        if app['Bitcoin'] is not None:
             addElement('bitcoin', app['Bitcoin'], doc, apel)
-        if app['Litecoin'] != None:
+        if app['Litecoin'] is not None:
             addElement('litecoin', app['Litecoin'], doc, apel)
-        if app['FlattrID'] != None:
+        if app['FlattrID'] is not None:
             addElement('flattr', app['FlattrID'], doc, apel)
 
         # These elements actually refer to the current version (i.e. which
@@ -600,7 +600,7 @@ def make_index(apps, apks, repodir, archive, categories):
     of.write(output)
     of.close()
 
-    if repo_keyalias != None:
+    if repo_keyalias is not None:
 
         if not options.quiet:
             print "Creating signed index."