ECMS-5445 Fix some violations
ECMS-5445 Fix some violations