OP-1119 Minor fixes