Dispatch modes and some fixes