Fixes up the worker implementation