EZP-22062 Fixed some CS issues