Orchestration

A couple of minor changes - see commit messages.