fixes after review (IDEA-CR-4422)