QAART-242 fixes after code review