OP-984 Minor changes.