[PATCH 1/2] more QA work