clean up dispatch tweaks