Fixed not finding multiple devices after upgrading bug.  Yay!