Fix: rebind location does not call init too early

And some other unrelated commits - best to review each commit independently.