worker fixes