Fixing dispatch type issues.