ECMS-5445 fix some violation of ECMS