ECMS-5578 fix some violations