Tweaks to dispatching