diff --git a/pyqtgraph/graphicsItems/ImageItem.py b/pyqtgraph/graphicsItems/ImageItem.py
index fad88bee757feb631a822d9a916d335157d4f743..530db7fb95dca6b971823fec26f466fcadb7091f 100644
--- a/pyqtgraph/graphicsItems/ImageItem.py
+++ b/pyqtgraph/graphicsItems/ImageItem.py
@@ -196,10 +196,12 @@ class ImageItem(GraphicsObject):
                 return
         else:
             gotNewData = True
-            if self.image is None or image.shape != self.image.shape:
-                self.prepareGeometryChange()
+            shapeChanged = (self.image is None or image.shape != self.image.shape)
             self.image = image.view(np.ndarray)
-            
+            if shapeChanged:
+                self.prepareGeometryChange()
+                self.informViewBoundsChanged()
+                
         prof.mark('1')
             
         if autoLevels is None:
diff --git a/pyqtgraph/graphicsItems/LegendItem.py b/pyqtgraph/graphicsItems/LegendItem.py
index 86973b04fe4f0c95e7cfb8193420f5a5fc06d67e..69ddffea3f428bcef06618dc2f87da09741773dc 100644
--- a/pyqtgraph/graphicsItems/LegendItem.py
+++ b/pyqtgraph/graphicsItems/LegendItem.py
@@ -92,7 +92,6 @@ class LegendItem(GraphicsWidget, GraphicsWidgetAnchor):
         # Thanks, Ulrich!
         # cycle for a match
         for sample, label in self.items:
-            print label.text, name
             if label.text == name:  # hit
                 self.items.remove( (sample, label) )    # remove from itemlist
                 self.layout.removeItem(sample)          # remove from layout
diff --git a/pyqtgraph/graphicsItems/ScatterPlotItem.py b/pyqtgraph/graphicsItems/ScatterPlotItem.py
index bec6a318e9840bc620aa089f2ee767b95e17c5bb..c83249014f3eaadc4a4d9d377a9a3f6fa4f9287a 100644
--- a/pyqtgraph/graphicsItems/ScatterPlotItem.py
+++ b/pyqtgraph/graphicsItems/ScatterPlotItem.py
@@ -35,6 +35,8 @@ for k, c in coords.items():
 
     
 def drawSymbol(painter, symbol, size, pen, brush):
+    if symbol is None:
+        return
     painter.scale(size, size)
     painter.setPen(pen)
     painter.setBrush(brush)