Make discovery work on solaris

Make discovery work on solaris