v2.2.2 - Auto-discovery fixes and improvements