-- minor changes for UCCPAR-491