Fixing Target endpoint dispatching issues on transport