Small changes before branching and setting up worker.