Fixing issues with worker identities clashing