additional worker fixes