Discovery fixes

http://ralph.allegrogroup.com/buildbot/builders/unittest-ralph-deshipu/builds/132