INT-3381: PR comments and other fixes