More fixes for worker class