a few QA fixes