Addressing a few more issues reported by QA