OP-1465 - fixes for some review suggestions