OP-1160: fixes from review