OP-1406 - Fixes from review comments