ECMS-5445 fix some violations of ECMS