Prevent duplicate transportService entries.
Fix local: protocol
More sonar fixes
Yeh, sonar compliancy above 94%!