Fix issues with learning next hop