QAART-208 code review fixes ber @bognix and @justnpT