OP-1216 fixes as suggested in OPReview-645