final round of cisco endpoint discovery fixes