Dispatch minor fixes added