diff --git a/.gitignore b/.gitignore
index eeabac2f..661062ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
+# ---- ignore special files written during config setup
+tk-metadata
+
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]
diff --git a/python/overlay_widget/shotgun_overlay_widget.py b/python/overlay_widget/shotgun_overlay_widget.py
index c39d142b..4c905d3b 100644
--- a/python/overlay_widget/shotgun_overlay_widget.py
+++ b/python/overlay_widget/shotgun_overlay_widget.py
@@ -129,7 +129,7 @@ def _set_mode(self, mode, payload=None):
         if mode == self.MODE_INFO_PIXMAP:
             self.setPixmap(payload)
         else:
-            self.setPixmap(None)
+            self.setPixmap(QtGui.QPixmap())  # i.e. self.pixmap().isNull()
 
         # Decide which kind of string we need to show.
         if mode == self.MODE_ERROR:
diff --git a/python/shotgun_fields/bubble_widget.py b/python/shotgun_fields/bubble_widget.py
index 5a834582..00500c6f 100644
--- a/python/shotgun_fields/bubble_widget.py
+++ b/python/shotgun_fields/bubble_widget.py
@@ -412,7 +412,7 @@ class _BubbleTextObject(QtGui.QPyTextObject):
 
     BUBBLE_DATA_PROPERTY = 1
     OBJECT_TYPE = QtGui.QTextFormat.UserFormat + 1
-    USING_PYQT = hasattr(QtCore, "QVariant")
+    USING_PYQT = not hasattr(QtCore, "ClassInfo")  # Only PySide has ClassInfo
 
     def __init__(self, parent=None):
         """
diff --git a/python/views/widget_delegate.py b/python/views/widget_delegate.py
index a0f635a3..6fa94fb5 100644
--- a/python/views/widget_delegate.py
+++ b/python/views/widget_delegate.py
@@ -13,7 +13,7 @@
 import sgtk
 from sgtk.platform.qt import QtCore, QtGui
 
-USING_PYQT = hasattr(QtCore, "QVariant")
+USING_PYQT = not hasattr(QtCore, "ClassInfo")  # Only PySide has ClassInfo
 
 
 class WidgetDelegate(QtGui.QStyledItemDelegate):