Fixes to dispatch logic