worker fixes
worker fixes