Many QA fixes