Fix task distribution issues