-- minor changes for UCCPAR-353