Remote fixes

So it can run from the bear and also setting up to be invoked directly.