-- notice fixes and minor changes for UCCPAR-394