IDEA-234984 fixes after code review