Fix some discovery issues