Fixes after review
Fixes after review

dudi3001/CM-Well,e-orz/CM-Well,dudi3001/CM-Well,thomsonreuters/CM-Well,dudi3001/CM-Well,thomsonreuters/CM-Well,e-orz/CM-Well,e-orz/CM-Well,dudi3001/CM-Well,e-orz/CM-Well,thomsonreuters/CM-Well,dudi3001/CM-Well,e-orz/CM-Well,thomsonreuters/CM-Well