QAART-164 code revied fixes per Bognix and Michal