Up worker number, fix id generation