Dispatch fixes