Wip/jsuereth remote control hooks

Here's a few fixes so that the hooks pass our integration test suite in Activator.

CC @huntc and @jroper