ECMS-5482 fix some code violations in ECMS