QAART-447 CR Fixes: Addressing the comments