Addressing  regressions and review comments