Fixed some of the dispatch breakage due to api changes.