Several fixes for discovery; misc changes
Misc