Fixes on WorkerType