Fixes for heartbeat/lookup

A handful of fixes related to passthru things. Agent is working with this driver with these fixes.

Haven't run tests yet, we'll see if travis beats my machine.