Minor Indirect Dispatch fixes