FactoryWorker fixes