QAART-217 code review fixes per @Bognix and @Michal