worker: fixes