QAART-45 fixes after code review