QAART-137 fixes after kkarolk code review