Minor fixes and sending agent_url with heartbeat

The driver won't be able to save anything during the first node lookup, so
sending the URL then won't be useful.